[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/buster-backports] 12 commits: test
Roger Shimizu
rosh at debian.org
Sun Apr 26 16:42:06 BST 2020
Roger Shimizu pushed to branch debian/buster-backports at Privacy Maintainers / torbrowser-launcher
Commits:
445bb485 by Roger Shimizu at 2020-04-12T16:46:35+09:00
test
- - - - -
f28f5e2c by Roger Shimizu at 2020-04-14T00:36:35+09:00
Rebuild as 0.3.2-8~bpo9+1 for stretch-backports-sloppy
- - - - -
bb60c727 by Roger Shimizu at 2020-04-18T16:47:10+09:00
d/patches: Refresh patches and amend 0017 patch to add more description
Thanks to intrigeri's review and help.
Closes: #913104
- - - - -
d3518348 by Roger Shimizu at 2020-04-18T16:53:22+09:00
d/rules: Minor fix for FTBFS on ubuntu
Closes: #958063
- - - - -
30f4b7ab by Roger Shimizu at 2020-04-18T17:33:13+09:00
d/control: Bump debhelper and policy version
Also remove debian/compat accordingly.
- - - - -
559b13b7 by Roger Shimizu at 2020-04-18T17:38:14+09:00
Prepare to release 0.3.2-9
- - - - -
70b9bc85 by Roger Shimizu at 2020-04-26T00:00:33+09:00
d/patches: Cherry-pick patch 0017 to fix the locale issue for python
Also remove 0008 patch, which conflicts with the fix.
Closes: #943922
- - - - -
309b512e by Roger Shimizu at 2020-04-26T19:41:38+09:00
d/patches: Add patch 0018
Fix use case that enforce install of EN version on non-EN user session.
Closes: #842021
- - - - -
af95b278 by Roger Shimizu at 2020-04-26T23:26:44+09:00
d/patches: Cherry-pick patch 0019 - 0025 patch from github pull request
Add several translation po.
- - - - -
e5ef4100 by Roger Shimizu at 2020-04-26T23:27:41+09:00
Prepare to release 0.3.2-10
- - - - -
702b0617 by Roger Shimizu at 2020-04-26T23:39:23+09:00
Merge tag 'debian/0.3.2-10'
- - - - -
0c57b8f2 by Roger Shimizu at 2020-04-26T23:39:52+09:00
Rebuild as 0.3.2-10~bpo10+1 for buster-backports
- - - - -
23 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/0008-pt_BR-translation.patch
- debian/patches/0009-pt_BR-translation.patch
- debian/patches/0011-Update-French-translation.patch → debian/patches/0010-Update-French-translation.patch
- debian/patches/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch → debian/patches/0011-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
- debian/patches/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch → debian/patches/0012-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
- debian/patches/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch → debian/patches/0013-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
- debian/patches/0015-Update-setup.py.patch → debian/patches/0014-Update-setup.py.patch
- debian/patches/0016-AppArmor-allow-u2f-devices.patch → debian/patches/0015-AppArmor-allow-u2f-devices.patch
- + debian/patches/0016-Silence-the-deny-apparmor-log-from-lsb_release.patch
- debian/patches/0008-Revert-Properly-detect-the-system-s-locale.patch → debian/patches/0017-Set-language-from-LC_MESSAGES-not-LC_CTYPE.patch
- + debian/patches/0018-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch
- + debian/patches/0019-Fix-language-fallback-for-Chinese-Hong-Kong.patch
- debian/patches/0010-pt_BR-translation.patch → debian/patches/0020-Add-da-to-torbrowser.desktop.patch
- + debian/patches/0021-Add-da-to-torbrowser-settings.desktop.patch
- + debian/patches/0022-Belarusian-localization-is-added.patch
- + debian/patches/0023-Added-de.po.patch
- + debian/patches/0024-Added-hr.po.patch
- + debian/patches/0025-Add-Chinese-Traditional-translation.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,43 @@
+torbrowser-launcher (0.3.2-10~bpo10+1) buster-backports; urgency=medium
+
+ * Rebuild for buster-backports.
+
+ -- Roger Shimizu <rosh at debian.org> Sun, 26 Apr 2020 23:39:51 +0900
+
+torbrowser-launcher (0.3.2-10) unstable; urgency=medium
+
+ * debian/patches:
+ - Remove 0008 patch.
+ - Cherry-pick patch 0017 to fix the locale issue for python.
+ (Closes: #943922)
+ - Add patch 0018 to fix use case that enforce install of EN version
+ on non-EN user session (Closes: #842021).
+ - Cherry-pick patch 0019 - 0025 patch from github pull request
+ to add several translation po.
+
+ -- Roger Shimizu <rosh at debian.org> Sun, 26 Apr 2020 23:27:41 +0900
+
+torbrowser-launcher (0.3.2-9) unstable; urgency=medium
+
+ * debian/patches:
+ - Refresh patches.
+ - Amend 0017 patch to add more description.
+ Thanks to intrigeri's review and help. (Closes: #913104)
+ * debian/rules:
+ - Minor fix for FTBFS on ubuntu. (Closes: #958063)
+ * debian/control:
+ - Bump debhelper version to 12.
+ - Bump policy version to 4.5.0
+ * Remove debian/compat.
+
+ -- Roger Shimizu <rosh at debian.org> Sat, 18 Apr 2020 17:38:14 +0900
+
+torbrowser-launcher (0.3.2-8~bpo9+1) stretch-backports-sloppy; urgency=medium
+
+ * Rebuild for stretch-backports-sloppy.
+
+ -- Roger Shimizu <rosh at debian.org> Tue, 14 Apr 2020 00:36:35 +0900
+
torbrowser-launcher (0.3.2-8~bpo10+1) buster-backports; urgency=medium
* Rebuild for buster-backports.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Roger Shimizu <rosh at debian.org>
Section: contrib/web
Priority: optional
Build-Depends:
- debhelper (>= 9.20120909~),
+ debhelper-compat (= 12),
dh-apparmor,
dh-python,
help2man,
@@ -14,7 +14,7 @@ Build-Depends:
python3-gpg,
python3-pyqt5,
python3-requests
-Standards-Version: 3.9.8
+Standards-Version: 4.5.0
Rules-Requires-Root: no
Homepage: https://micahflee.com/torbrowser-launcher/
Vcs-Git: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher.git
=====================================
debian/patches/0008-pt_BR-translation.patch
=====================================
@@ -0,0 +1,36 @@
+From: =?utf-8?b?Ikpvw6NvIFbDrXRvciBTLiBGIg==?=
+ <48962164+jjoaovitor7 at users.noreply.github.com>
+Date: Mon, 29 Jul 2019 08:13:54 -0300
+Subject: pt_BR translation.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+
+(cherry picked from commit 0bd4779cc639e549cb408a6130b4022c647414c0)
+---
+ share/applications/torbrowser-settings.desktop | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
+index c2c18d1..4f12adb 100644
+--- a/share/applications/torbrowser-settings.desktop
++++ b/share/applications/torbrowser-settings.desktop
+@@ -3,6 +3,7 @@ Name=Tor Browser Launcher Settings
+ Name[fr]=Tor Browser Launcher configurations
+ Name[hu]=Tor-böngésző indító beállításai
+ Name[nl]=Tor Browser Launcher Instellingen
++Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Name[ru]=Tor Browser (настройки запуска)
+ GenericName=Tor Browser Launcher Settings
+ GenericName[hu]=Tor-böngésző indító beállításai
+@@ -10,6 +11,7 @@ Comment=Tor Browser Launcher Settings
+ Comment[fr]=Tor Browser Launcher configurations
+ Comment[hu]=Tor-böngésző indító beállításai
+ Comment[nl]=Tor Browser Launcher Instellingen
++Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Comment[ru]=Tor Browser (настройки запуска)
+ Exec=torbrowser-launcher --settings
+ Terminal=false
=====================================
debian/patches/0009-pt_BR-translation.patch
=====================================
@@ -1,36 +1,30 @@
From: =?utf-8?b?Ikpvw6NvIFbDrXRvciBTLiBGIg==?=
<48962164+jjoaovitor7 at users.noreply.github.com>
-Date: Mon, 29 Jul 2019 08:13:54 -0300
+Date: Mon, 29 Jul 2019 08:35:16 -0300
Subject: pt_BR translation.
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Name[pt_BR]=Navegador Tor (Configurações do Lançador)
-Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+Name[pt_BR]=Navegador Tor
+Comment[pt_BR]=Navegador Tor
-(cherry picked from commit 0bd4779cc639e549cb408a6130b4022c647414c0)
+(cherry picked from commit f12222d5d18a29cc51009897174986c14911b9d0)
---
- share/applications/torbrowser-settings.desktop | 2 ++
+ share/applications/torbrowser.desktop | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
-index c2c18d1..4f12adb 100644
---- a/share/applications/torbrowser-settings.desktop
-+++ b/share/applications/torbrowser-settings.desktop
-@@ -3,6 +3,7 @@ Name=Tor Browser Launcher Settings
- Name[fr]=Tor Browser Launcher configurations
- Name[hu]=Tor-böngésző indító beállításai
- Name[nl]=Tor Browser Launcher Instellingen
-+Name[pt_BR]=Navegador Tor (Configurações do Lançador)
- Name[ru]=Tor Browser (настройки запуска)
- GenericName=Tor Browser Launcher Settings
- GenericName[hu]=Tor-böngésző indító beállításai
-@@ -10,6 +11,7 @@ Comment=Tor Browser Launcher Settings
- Comment[fr]=Tor Browser Launcher configurations
- Comment[hu]=Tor-böngésző indító beállításai
- Comment[nl]=Tor Browser Launcher Instellingen
-+Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
- Comment[ru]=Tor Browser (настройки запуска)
- Exec=torbrowser-launcher --settings
+diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
+index 739be8d..7a25076 100644
+--- a/share/applications/torbrowser.desktop
++++ b/share/applications/torbrowser.desktop
+@@ -1,10 +1,12 @@
+ [Desktop Entry]
+ Name=Tor Browser
+ Name[hu]=Tor-böngésző
++Name[pt_BR]=Navegador Tor
+ GenericName=Tor browser
+ GenericName[hu]=Tor böngésző indító
+ Comment=Launch Tor Browser
+ Comment[hu]=Tor böngésző indító
++Comment[pt_BR]=Navegador Tor
+ Exec=torbrowser-launcher %u
Terminal=false
+ Type=Application
=====================================
debian/patches/0011-Update-French-translation.patch → debian/patches/0010-Update-French-translation.patch
=====================================
=====================================
debian/patches/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch → debian/patches/0011-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
=====================================
=====================================
debian/patches/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch → debian/patches/0012-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
=====================================
=====================================
debian/patches/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch → debian/patches/0013-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
=====================================
=====================================
debian/patches/0015-Update-setup.py.patch → debian/patches/0014-Update-setup.py.patch
=====================================
=====================================
debian/patches/0016-AppArmor-allow-u2f-devices.patch → debian/patches/0015-AppArmor-allow-u2f-devices.patch
=====================================
@@ -8,10 +8,10 @@ Subject: [PATCH] Allow torbrowser to access u2f devices
1 file changed, 9 insertions(+)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 42516b6..c067375 100644
+index 8d96043..1266476 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -133,5 +133,14 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -134,5 +134,14 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
/etc/xfce4/defaults.list r,
/usr/share/xfce4/applications/ r,
=====================================
debian/patches/0016-Silence-the-deny-apparmor-log-from-lsb_release.patch
=====================================
@@ -0,0 +1,27 @@
+From: Roger Shimizu <rosh at debian.org>
+Date: Sun, 12 Apr 2020 16:02:51 +0900
+Subject: Silence the deny apparmor log from lsb_release
+
+This resolves debian bug: https://bugs.debian.org/913104
+
+lsb_release is only used by Firefox to add extra information to crash reports,
+and Tor Browser is built with --disable-crashreporter.
+
+Therefore, AppArmor denying execution of lsb_release should be a no-op,
+and we can silence the corresponding log message.
+---
+ apparmor/torbrowser.Browser.firefox | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index 1266476..e7ebddc 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -122,6 +122,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+ deny /sys/devices/system/cpu/cpufreq/policy[0-9]*/cpuinfo_max_freq r,
+ deny /sys/devices/system/cpu/*/cache/index[0-9]*/size r,
+ deny /run/user/[0-9]*/dconf/user rw,
++ deny /usr/bin/lsb_release x,
+
+ # Silence denial logs about PulseAudio
+ deny /etc/pulse/client.conf r,
=====================================
debian/patches/0008-Revert-Properly-detect-the-system-s-locale.patch → debian/patches/0017-Set-language-from-LC_MESSAGES-not-LC_CTYPE.patch
=====================================
@@ -1,21 +1,30 @@
-From: Roger Shimizu <rosh at debian.org>
-Date: Tue, 13 Nov 2018 00:53:09 +0900
-Subject: Revert "Properly detect the system's locale"
+From: Karl-Johan Karlsson <creideiki at ferretporn.se>
+Date: Sun, 6 Jan 2019 13:58:43 +0100
+Subject: Set language from LC_MESSAGES, not LC_CTYPE
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/383
-This reverts commit b828bdfafe60bb9bcf93ec660ad5c07ff7fdbdf5.
+Calling `locale.getlocale()` checks LC_CTYPE, which is not meant for
+UI strings. Change the call to check LC_MESSAGES instead.
+
+Also call `locale.setlocale()` first to import the locale settings
+from the environment. This is not needed for LC_CTYPE due to
+https://bugs.python.org/issue6203 but is required for LC_MESSAGES.
+
+(cherry picked from commit cd8edcd637520d2a652dddbf0004b7eb96f4f748)
---
- torbrowser_launcher/common.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ torbrowser_launcher/common.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index 25bb984..1d619b1 100644
+index 25bb984..6533723 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
-@@ -73,7 +73,7 @@ class Common(object):
+@@ -73,7 +73,8 @@ class Common(object):
# figure out the language
available_languages = ['ar', 'ca', 'da', 'de', 'en-US', 'es-ES', 'fa', 'fr', 'ga-IE', 'he', 'id', 'is', 'it', 'ja', 'ko', 'nb-NO', 'nl', 'pl', 'pt-BR', 'ru', 'sv-SE', 'tr', 'vi', 'zh-CN', 'zh-TW']
- default_locale = locale.getlocale()[0]
++ locale.setlocale(locale.LC_MESSAGES, '')
+ default_locale = locale.getlocale(locale.LC_MESSAGES)[0]
if default_locale is None:
self.language = 'en-US'
=====================================
debian/patches/0018-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch
=====================================
@@ -0,0 +1,64 @@
+From: Roger Shimizu <rosh at debian.org>
+Date: Sun, 26 Apr 2020 18:25:52 +0900
+Subject: Fix use case that enforce install of EN version on non-EN user
+ session
+
+build_paths() is called before load_settings(), so it won't recognize
+"force_en-US" setting.
+
+Here we add build_paths() again after load_settings() to do the trick.
+
+Closes: #842021
+---
+ torbrowser_launcher/common.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index 6533723..1679a96 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -62,6 +62,7 @@ class Common(object):
+ self.mkdir(self.paths['dirs'][d])
+ self.load_mirrors()
+ self.load_settings()
++ self.build_paths()
+ self.mkdir(self.paths['download_dir'])
+ self.mkdir(self.paths['tbb']['dir'])
+ self.init_gnupg()
+@@ -107,6 +108,10 @@ class Common(object):
+ tbb_local = '{0}/.local/share/torbrowser'.format(homedir)
+ old_tbb_data = '{0}/.torbrowser'.format(homedir)
+
++ if hasattr(self, 'settings') and self.settings['force_en-US']:
++ language = 'en-US'
++ else:
++ language = self.language
+ if tbb_version:
+ # tarball filename
+ if self.architecture == 'x86_64':
+@@ -114,10 +119,6 @@ class Common(object):
+ else:
+ arch = 'linux32'
+
+- if hasattr(self, 'settings') and self.settings['force_en-US']:
+- language = 'en-US'
+- else:
+- language = self.language
+ tarball_filename = 'tor-browser-' + arch + '-' + tbb_version + '_' + language + '.tar.xz'
+
+ # tarball
+@@ -153,11 +154,11 @@ class Common(object):
+ 'version_check_file': tbb_cache + '/download/release.xml',
+ 'tbb': {
+ 'changelog': tbb_local + '/tbb/' + self.architecture + '/tor-browser_' +
+- self.language + '/Browser/TorBrowser/Docs/ChangeLog.txt',
++ language + '/Browser/TorBrowser/Docs/ChangeLog.txt',
+ 'dir': tbb_local + '/tbb/' + self.architecture,
+- 'dir_tbb': tbb_local + '/tbb/' + self.architecture + '/tor-browser_' + self.language,
++ 'dir_tbb': tbb_local + '/tbb/' + self.architecture + '/tor-browser_' + language,
+ 'start': tbb_local + '/tbb/' + self.architecture + '/tor-browser_' +
+- self.language + '/start-tor-browser.desktop'
++ language + '/start-tor-browser.desktop'
+ },
+ }
+
=====================================
debian/patches/0019-Fix-language-fallback-for-Chinese-Hong-Kong.patch
=====================================
@@ -0,0 +1,39 @@
+From: Koala Yeung <koalay at gmail.com>
+Date: Wed, 22 Apr 2020 21:52:18 +0800
+Subject: Fix language fallback for Chinese (Hong Kong)
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/464
+
+* Add a way to manually override the language detection
+ for some of the languages.
+* Add manual language overriding for zh-HK (to zh-TW).
+
+(cherry picked from commit e92e11e6d7cde178d4aad3635fe84a32e5a32069)
+---
+ torbrowser_launcher/common.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index 1679a96..b141894 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -74,12 +74,20 @@ class Common(object):
+
+ # figure out the language
+ available_languages = ['ar', 'ca', 'da', 'de', 'en-US', 'es-ES', 'fa', 'fr', 'ga-IE', 'he', 'id', 'is', 'it', 'ja', 'ko', 'nb-NO', 'nl', 'pl', 'pt-BR', 'ru', 'sv-SE', 'tr', 'vi', 'zh-CN', 'zh-TW']
++
++ # a list of manually configured language fallback overriding
++ language_overrides = {
++ 'zh-HK': 'zh-TW',
++ }
++
+ locale.setlocale(locale.LC_MESSAGES, '')
+ default_locale = locale.getlocale(locale.LC_MESSAGES)[0]
+ if default_locale is None:
+ self.language = 'en-US'
+ else:
+ self.language = default_locale.replace('_', '-')
++ if self.language in language_overrides:
++ self.language = language_overrides[self.language]
+ if self.language not in available_languages:
+ self.language = self.language.split('-')[0]
+ if self.language not in available_languages:
=====================================
debian/patches/0010-pt_BR-translation.patch → debian/patches/0020-Add-da-to-torbrowser.desktop.patch
=====================================
@@ -1,30 +1,28 @@
-From: =?utf-8?b?Ikpvw6NvIFbDrXRvciBTLiBGIg==?=
- <48962164+jjoaovitor7 at users.noreply.github.com>
-Date: Mon, 29 Jul 2019 08:35:16 -0300
-Subject: pt_BR translation.
+From: scootergrisen <scootergrisen at gmail.com>
+Date: Fri, 1 Mar 2019 17:31:07 +0100
+Subject: Add [da] to torbrowser.desktop
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/392
-Name[pt_BR]=Navegador Tor
-Comment[pt_BR]=Navegador Tor
-
-(cherry picked from commit f12222d5d18a29cc51009897174986c14911b9d0)
+(cherry picked from commit 1fa13798454a6f985438d36e387c09a34e20881c)
---
- share/applications/torbrowser.desktop | 2 ++
- 1 file changed, 2 insertions(+)
+ share/applications/torbrowser.desktop | 3 +++
+ 1 file changed, 3 insertions(+)
diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
-index 739be8d..7a25076 100644
+index 7a25076..c787e63 100644
--- a/share/applications/torbrowser.desktop
+++ b/share/applications/torbrowser.desktop
-@@ -1,10 +1,12 @@
+@@ -1,10 +1,13 @@
[Desktop Entry]
Name=Tor Browser
++Name[da]=Tor Browser
Name[hu]=Tor-böngésző
-+Name[pt_BR]=Navegador Tor
+ Name[pt_BR]=Navegador Tor
GenericName=Tor browser
++GenericName[da]=Tor Browser
GenericName[hu]=Tor böngésző indító
Comment=Launch Tor Browser
++Comment[da]=Start Tor Browser
Comment[hu]=Tor böngésző indító
-+Comment[pt_BR]=Navegador Tor
+ Comment[pt_BR]=Navegador Tor
Exec=torbrowser-launcher %u
- Terminal=false
- Type=Application
=====================================
debian/patches/0021-Add-da-to-torbrowser-settings.desktop.patch
=====================================
@@ -0,0 +1,31 @@
+From: scootergrisen <scootergrisen at gmail.com>
+Date: Fri, 1 Mar 2019 17:31:12 +0100
+Subject: Add [da] to torbrowser-settings.desktop
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/393
+
+(cherry picked from commit 897a532538e79a7d693284ab9aeffb1b074f73a0)
+---
+ share/applications/torbrowser-settings.desktop | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
+index 4f12adb..2c45464 100644
+--- a/share/applications/torbrowser-settings.desktop
++++ b/share/applications/torbrowser-settings.desktop
+@@ -1,13 +1,16 @@
+ [Desktop Entry]
+ Name=Tor Browser Launcher Settings
++Name[da]=Indstillinger for Tor Browser-opstarter
+ Name[fr]=Tor Browser Launcher configurations
+ Name[hu]=Tor-böngésző indító beállításai
+ Name[nl]=Tor Browser Launcher Instellingen
+ Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Name[ru]=Tor Browser (настройки запуска)
+ GenericName=Tor Browser Launcher Settings
++GenericName[da]=Indstillinger for Tor Browser-opstarter
+ GenericName[hu]=Tor-böngésző indító beállításai
+ Comment=Tor Browser Launcher Settings
++Comment[da]=Indstillinger for Tor Browser-opstarter
+ Comment[fr]=Tor Browser Launcher configurations
+ Comment[hu]=Tor-böngésző indító beállításai
+ Comment[nl]=Tor Browser Launcher Instellingen
=====================================
debian/patches/0022-Belarusian-localization-is-added.patch
=====================================
@@ -0,0 +1,319 @@
+From: Viktar Siarheichyk <vics at eq.by>
+Date: Sat, 26 Oct 2019 20:07:33 +0300
+Subject: Belarusian localization is added.
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/438
+
+(cherry picked from commit 110d50b053d4c3b19f8b7ad809923e59bae16950)
+(cherry picked from commit 5b3bdf45b85b13ba9371ce68743624fecab5d7d5)
+---
+ po/be.po | 254 +++++++++++++++++++++++++
+ share/applications/torbrowser-settings.desktop | 3 +
+ share/applications/torbrowser.desktop | 3 +
+ 3 files changed, 260 insertions(+)
+ create mode 100644 po/be.po
+
+diff --git a/po/be.po b/po/be.po
+new file mode 100644
+index 0000000..990ca5a
+--- /dev/null
++++ b/po/be.po
+@@ -0,0 +1,254 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2018-03-23 15:47-0700\n"
++"PO-Revision-Date: 2019-10-26 19:51+0300\n"
++"Last-Translator: Viktar Siarheichyk <vics at eq.by>\n"
++"Language-Team: Belarusian <debian-l10n-belarusian at lists.debian.org>\n"
++"Language: be\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: __init__.py:65 launcher.py:470
++msgid "Tor Browser Launcher"
++msgstr "Запускальнік Tor Browser"
++
++#: __init__.py:66
++msgid "By Micah Lee, licensed under MIT"
++msgstr "Аўтар Micah Lee, ліцэнзія MIT"
++
++#: __init__.py:67
++#, python-brace-format
++msgid "version {0}"
++msgstr "версія {0}"
++
++#: common.py:100
++#, python-brace-format
++msgid "Error creating {0}"
++msgstr "Памылка падчас стварэння {0}"
++
++#: common.py:102 common.py:180
++#, python-brace-format
++msgid "{0} is not writable"
++msgstr "{0} не можа быць запісаны"
++
++#: common.py:177
++#, python-brace-format
++msgid "Cannot create directory {0}"
++msgstr "Не ўдалася стварыць каталог {0}"
++
++#: common.py:187
++msgid "Creating GnuPG homedir"
++msgstr "Ствараем хатні каталог GnuPG"
++
++#: common.py:254
++#, python-format
++msgid "Could not import key with fingerprint: %s."
++msgstr "Не ўдалося імпартаваць ключ з адбіткам: %s."
++
++#: common.py:259
++msgid "Not all keys were imported successfully!"
++msgstr "Не ўсе ключы імпартаваны паспяхова!"
++
++#: launcher.py:83
++msgid "Downloading Tor Browser for the first time."
++msgstr "Атрыманне Tor Browser упершыню."
++
++#: launcher.py:85
++msgid ""
++"Your version of Tor Browser is out-of-date. Downloading the newest version."
++msgstr "Ваша версія Tor Browser пратэрмінавана. Атрымліваем найноўшую версію."
++
++#: launcher.py:100
++msgid "Downloading over Tor"
++msgstr "Згружаем праз Tor"
++
++#: launcher.py:111
++msgid "Tor Browser"
++msgstr "Tor Browser"
++
++#: launcher.py:128
++msgid "Start"
++msgstr "Запуск"
++
++#: launcher.py:174
++msgid "Yes"
++msgstr "Так"
++
++#: launcher.py:178
++msgid "Exit"
++msgstr "Выйсці"
++
++#: launcher.py:192 settings.py:136
++msgid "Cancel"
++msgstr "Адмяніць"
++
++#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
++#: launcher.py:281
++msgid "Downloading"
++msgstr "Згружаецца"
++
++#: launcher.py:238
++msgid "Latest version: {}"
++msgstr "Апошняя версія: {}"
++
++#: launcher.py:241
++msgid "Error detecting Tor Browser version."
++msgstr "Памылка падчас вызначэння версіі Tor Browser."
++
++#: launcher.py:256 launcher.py:357
++msgid "Verifying Signature"
++msgstr "Правяраецца подпіс"
++
++#: launcher.py:260
++msgid "Extracting"
++msgstr "Распакоўваецца"
++
++#: launcher.py:264
++msgid "Running"
++msgstr "Працуе"
++
++#: launcher.py:268
++msgid "Starting download over again"
++msgstr "Запускаем загрузку наноў"
++
++#: launcher.py:279 launcher.py:295
++msgid "(over Tor)"
++msgstr "(праз Tor)"
++
++#: launcher.py:293
++msgid "Downloaded"
++msgstr "Згружана"
++
++#: launcher.py:393
++msgid "Installing"
++msgstr "Усталяванне"
++
++#: launcher.py:401
++#, python-brace-format
++msgid "Tor Browser Launcher doesn't understand the file format of {0}"
++msgstr "Запускальнік Tor Browser не разумее фармат файла {0}"
++
++#: launcher.py:427
++msgid ""
++"The version of Tor Browser you have installed is earlier than it should be, "
++"which could be a sign of an attack!"
++msgstr ""
++"Версія Tor Browser, якую вы паставілі, ёсць ранейшай, чым мае быць, што "
++"можа паказваць на атаку!"
++
++#: launcher.py:446
++msgid "Downloading Tor Browser over again."
++msgstr "Атрыманне Tor Browser наноў."
++
++#: launcher.py:516 launcher.py:525 launcher.py:533
++msgid "Download Error:"
++msgstr "Памылка загрузкі:"
++
++#: launcher.py:517
++msgid "You are currently using a non-default mirror"
++msgstr "Зараз вы карыстаецеся нестандартным люстэркам"
++
++#: launcher.py:518
++msgid "Would you like to switch back to the default?"
++msgstr "Змяніць на стандартнае?"
++
++#: launcher.py:527
++msgid "Would you like to try the English version of Tor Browser instead?"
++msgstr "Паспрабаваць узамен ангельскую версію Tor Browser?"
++
++#: launcher.py:548
++#, python-brace-format
++msgid ""
++"Invalid SSL certificate for:\n"
++"{0}\n"
++"\n"
++"You may be under attack."
++msgstr ""
++"Няправільны сертыфікат SSL для:\n"
++"{0}\n"
++"\n"
++"Магчыма, вас атакуюць."
++
++#: launcher.py:550
++msgid "Try the download again using Tor?"
++msgstr "Зноў паспрабаваць згрузіць праз Tor?"
++
++#: launcher.py:559
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Trying to download over Tor. Are you sure Tor is configured correctly and "
++"running?"
++msgstr ""
++"Памылка падчас запуску загрузкі:\n"
++"\n"
++"{0}\n"
++"\n"
++"Спрабуем згрузіць праз Tor. Перакананыя, што Tor карэктна сканфігураваны і "
++"працуе?"
++
++#: launcher.py:563
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Are you connected to the internet?"
++msgstr ""
++"Памылка падчас запуску загрузкі:\n"
++"\n"
++"{0}\n"
++"\n"
++"Вы далучаны да інтэрнэта?"
++
++#: settings.py:46
++msgid "Tor Browser Launcher Settings"
++msgstr "Налады запускальніка Tor Browser"
++
++#: settings.py:50
++msgid "Download over system Tor"
++msgstr "Згрузіць праз сістэмны Tor"
++
++#: settings.py:57
++msgid "Force downloading English version of Tor Browser"
++msgstr "Прымусова згрузіць ангельскую версію Tor Browser"
++
++#: settings.py:66
++msgid "Tor server"
++msgstr "Сервер Tor"
++
++#: settings.py:82
++msgid "Status: Installed"
++msgstr "Стан: усталяваны"
++
++#: settings.py:84
++msgid "Status: Not Installed"
++msgstr "Стан: не ўсталяваны"
++
++#: settings.py:87
++msgid "Install Tor Browser"
++msgstr "Усталяваць Tor Browser"
++
++#: settings.py:92
++msgid "Reinstall Tor Browser"
++msgstr "Пераставіць Tor Browser"
++
++#: settings.py:115
++msgid "Mirror"
++msgstr "Люстэрка"
++
++#: settings.py:131
++msgid "Save && Exit"
++msgstr "Захаваць && выйсці"
+diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
+index 2c45464..10e00e2 100644
+--- a/share/applications/torbrowser-settings.desktop
++++ b/share/applications/torbrowser-settings.desktop
+@@ -6,9 +6,11 @@ Name[hu]=Tor-böngésző indító beállításai
+ Name[nl]=Tor Browser Launcher Instellingen
+ Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Name[ru]=Tor Browser (настройки запуска)
++Name[be]=Налады запускальніка Tor Browser
+ GenericName=Tor Browser Launcher Settings
+ GenericName[da]=Indstillinger for Tor Browser-opstarter
+ GenericName[hu]=Tor-böngésző indító beállításai
++GenericName[be]=Налады запускальніка Tor Browser
+ Comment=Tor Browser Launcher Settings
+ Comment[da]=Indstillinger for Tor Browser-opstarter
+ Comment[fr]=Tor Browser Launcher configurations
+@@ -16,6 +18,7 @@ Comment[hu]=Tor-böngésző indító beállításai
+ Comment[nl]=Tor Browser Launcher Instellingen
+ Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Comment[ru]=Tor Browser (настройки запуска)
++Comment[be]=Налады запускальніка Tor Browser
+ Exec=torbrowser-launcher --settings
+ Terminal=false
+ Type=Application
+diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
+index c787e63..b679bd7 100644
+--- a/share/applications/torbrowser.desktop
++++ b/share/applications/torbrowser.desktop
+@@ -3,13 +3,16 @@ Name=Tor Browser
+ Name[da]=Tor Browser
+ Name[hu]=Tor-böngésző
+ Name[pt_BR]=Navegador Tor
++Name[be]=Tor Browser
+ GenericName=Tor browser
+ GenericName[da]=Tor Browser
+ GenericName[hu]=Tor böngésző indító
++GenericName[be]=Tor Browser
+ Comment=Launch Tor Browser
+ Comment[da]=Start Tor Browser
+ Comment[hu]=Tor böngésző indító
+ Comment[pt_BR]=Navegador Tor
++Comment[be]=Запуск Tor Browser
+ Exec=torbrowser-launcher %u
+ Terminal=false
+ Type=Application
=====================================
debian/patches/0023-Added-de.po.patch
=====================================
@@ -0,0 +1,286 @@
+From: Baumgartner <ned84 at protonmail.com>
+Date: Sun, 15 Dec 2019 21:40:58 +0100
+Subject: Added de.po
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/449
+
+(cherry picked from commit 12481e0635b491fa359d39831b5e176fe6a21599)
+---
+ po/de.po | 255 ++++++++++++++++++++++++++++++++++++++++++
+ torbrowser_launcher/common.py | 2 +-
+ 2 files changed, 256 insertions(+), 1 deletion(-)
+ create mode 100644 po/de.po
+
+diff --git a/po/de.po b/po/de.po
+new file mode 100644
+index 0000000..81317cd
+--- /dev/null
++++ b/po/de.po
+@@ -0,0 +1,255 @@
++msgid ""
++msgstr ""
++"Project-Id-Version: \n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2018-03-23 15:47-0700\n"
++"PO-Revision-Date: 2019-12-15 21:28+0100\n"
++"Last-Translator: René Mario Baumgartner <ned84 at protonmail.com>\n"
++"Language-Team: \n"
++"Language: de\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 2.2.4\n"
++"X-Poedit-Basepath: .\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++
++#: __init__.py:65 launcher.py:470
++msgid "Tor Browser Launcher"
++msgstr "Tor Browser Launcher"
++
++#: __init__.py:66
++msgid "By Micah Lee, licensed under MIT"
++msgstr "Von Micah Lee, lizensiert unter MIT"
++
++#: __init__.py:67
++#, python-brace-format
++msgid "version {0}"
++msgstr "Version {0}"
++
++#: common.py:100
++#, python-brace-format
++msgid "Error creating {0}"
++msgstr "Fehler erzeugt {0}"
++
++#: common.py:102 common.py:180
++#, python-brace-format
++msgid "{0} is not writable"
++msgstr "{0} ist nicht schreibbar"
++
++#: common.py:177
++#, python-brace-format
++msgid "Cannot create directory {0}"
++msgstr "Kann Verzeichnis {0} nicht erzeugen"
++
++#: common.py:187
++msgid "Creating GnuPG homedir"
++msgstr "Erzeuge GnuPG Verzeichnis"
++
++#: common.py:254
++#, python-format
++msgid "Could not import key with fingerprint: %s."
++msgstr "Konnte Schlüssel mit folgendem Fingerabdruck nicht importieren: %s."
++
++#: common.py:259
++msgid "Not all keys were imported successfully!"
++msgstr "Nicht alle Schlüssel konnten erfolgreich importiert werden!"
++
++#: launcher.py:83
++msgid "Downloading Tor Browser for the first time."
++msgstr "Lade Tor Browser das erste mal herunter."
++
++#: launcher.py:85
++msgid ""
++"Your version of Tor Browser is out-of-date. Downloading the newest version."
++msgstr ""
++"Ihre Version des Tor Browsers ist nicht mehr aktuell. Lade die neueste "
++"Version herunter."
++
++#: launcher.py:100
++msgid "Downloading over Tor"
++msgstr "Lade über Tor herunter"
++
++#: launcher.py:111
++msgid "Tor Browser"
++msgstr "Tor Browser"
++
++#: launcher.py:128
++msgid "Start"
++msgstr "Start"
++
++#: launcher.py:174
++msgid "Yes"
++msgstr "Ja"
++
++#: launcher.py:178
++msgid "Exit"
++msgstr "Exit"
++
++#: launcher.py:192 settings.py:136
++msgid "Cancel"
++msgstr "Abbruch"
++
++#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
++#: launcher.py:281
++msgid "Downloading"
++msgstr "Herunterladen"
++
++#: launcher.py:238
++msgid "Latest version: {}"
++msgstr "Aktuelle Version: {}"
++
++#: launcher.py:241
++msgid "Error detecting Tor Browser version."
++msgstr "Fehler bei dem Versuch die Tor Browser Version zu finden."
++
++#: launcher.py:256 launcher.py:357
++msgid "Verifying Signature"
++msgstr "Prüfe Signatur"
++
++#: launcher.py:260
++msgid "Extracting"
++msgstr "Extrahieren"
++
++#: launcher.py:264
++msgid "Running"
++msgstr "Läuft"
++
++#: launcher.py:268
++msgid "Starting download over again"
++msgstr "Starte download nochmals"
++
++#: launcher.py:279 launcher.py:295
++msgid "(over Tor)"
++msgstr "(über Tor)"
++
++#: launcher.py:293
++msgid "Downloaded"
++msgstr "Heruntergeladen"
++
++#: launcher.py:393
++msgid "Installing"
++msgstr "Installiere"
++
++#: launcher.py:401
++#, python-brace-format
++msgid "Tor Browser Launcher doesn't understand the file format of {0}"
++msgstr "Tor Browser versteht folgendes Datei Format nicht: {0}"
++
++#: launcher.py:427
++msgid ""
++"The version of Tor Browser you have installed is earlier than it should be, "
++"which could be a sign of an attack!"
++msgstr ""
++"Die Version ihres Tor Browsers ist neuer als sie sein sollte, was auf eine "
++"Attacke schließen lassen könnte!"
++
++#: launcher.py:446
++msgid "Downloading Tor Browser over again."
++msgstr "Lade Tor Browser nochmals herunter."
++
++#: launcher.py:516 launcher.py:525 launcher.py:533
++msgid "Download Error:"
++msgstr "Fehler beim herunterladen:"
++
++#: launcher.py:517
++msgid "You are currently using a non-default mirror"
++msgstr "Sie verwenden zur Zeit einen nicht voreingestellten Mirror."
++
++#: launcher.py:518
++msgid "Would you like to switch back to the default?"
++msgstr "Wollen sie zur Voreinstellung wechseln?"
++
++#: launcher.py:527
++msgid "Would you like to try the English version of Tor Browser instead?"
++msgstr ""
++"Wollen sie die englische Version des Tor Browsers stattdessen versuchen?"
++
++#: launcher.py:548
++#, python-brace-format
++msgid ""
++"Invalid SSL certificate for:\n"
++"{0}\n"
++"\n"
++"You may be under attack."
++msgstr ""
++"Ungültiges SSL Zertifikat für:\n"
++"{0}\n"
++"\n"
++"Möglicherweise werden sie angegriffen."
++
++#: launcher.py:550
++msgid "Try the download again using Tor?"
++msgstr "Wollen sie das herunterladen nochmals über Tor versuchen?"
++
++#: launcher.py:559
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Trying to download over Tor. Are you sure Tor is configured correctly and "
++"running?"
++msgstr ""
++"Fehler beim starten des Downloads:\n"
++"\n"
++"{0}\n"
++"\n"
++"Versuche über Tor herunterzuladen. Sind sie sicher das Tor richtig "
++"konfiguriert und aktiv ist?"
++
++#: launcher.py:563
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Are you connected to the internet?"
++msgstr ""
++"Fehler beim starten des Downloads:\n"
++"\n"
++"{0}\n"
++"\n"
++"Sind sie mit dem Internet verbunden?"
++
++#: settings.py:46
++msgid "Tor Browser Launcher Settings"
++msgstr "Tor Browser Launcher Einstellungen"
++
++#: settings.py:50
++msgid "Download over system Tor"
++msgstr "Herunterladen über system Tor"
++
++#: settings.py:57
++msgid "Force downloading English version of Tor Browser"
++msgstr "Herunterladen der englischen Version des Tor Browsers erzwingen"
++
++#: settings.py:66
++msgid "Tor server"
++msgstr "Tor server"
++
++#: settings.py:82
++msgid "Status: Installed"
++msgstr "Status: Installiert"
++
++#: settings.py:84
++msgid "Status: Not Installed"
++msgstr "Status: Nicht installiert"
++
++#: settings.py:87
++msgid "Install Tor Browser"
++msgstr "Tor Browser installieren"
++
++#: settings.py:92
++msgid "Reinstall Tor Browser"
++msgstr "Tor Browser nochmals installieren"
++
++#: settings.py:115
++msgid "Mirror"
++msgstr "Mirror"
++
++#: settings.py:131
++msgid "Save && Exit"
++msgstr "Speichern && Exit"
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index b141894..9cff5dc 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -109,7 +109,7 @@ class Common(object):
+ except:
+ self.set_gui('error', _("Error creating {0}").format(homedir), [], False)
+ if not os.access(homedir, os.W_OK):
+- self.set_gui('error', _("{0} is not writable").format(homedir), [], False)
++ self.set_gui('error', _("{0} is not writeable").format(homedir), [], False)
+
+ tbb_config = '{0}/.config/torbrowser'.format(homedir)
+ tbb_cache = '{0}/.cache/torbrowser'.format(homedir)
=====================================
debian/patches/0024-Added-hr.po.patch
=====================================
@@ -0,0 +1,277 @@
+From: milotype <43657314+milotype at users.noreply.github.com>
+Date: Wed, 22 Jan 2020 13:59:37 +0100
+Subject: Added hr.po
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/450
+
+Complete croatian translation
+
+(cherry picked from commit bc96f44962bbdd4f4ef110e20a6f4223e116f828)
+---
+ po/hr.po | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 258 insertions(+)
+ create mode 100644 po/hr.po
+
+diff --git a/po/hr.po b/po/hr.po
+new file mode 100644
+index 0000000..f1dc9e6
+--- /dev/null
++++ b/po/hr.po
+@@ -0,0 +1,258 @@
++# Croatian translation of Tor Browser Launcher.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# Milo Ivir <mail at milotype.de>, 2020.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: Tor Browser Launcher\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2018-03-23 15:47-0700\n"
++"PO-Revision-Date: 2020-01-22 13:20+0100\n"
++"Last-Translator: Milo Ivir <mail at milotype.de>\n"
++"Language-Team: \n"
++"Language: hr\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 1.8.12\n"
++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
++
++#: __init__.py:65 launcher.py:470
++msgid "Tor Browser Launcher"
++msgstr "Pokretač Tor preglednika"
++
++#: __init__.py:66
++msgid "By Micah Lee, licensed under MIT"
++msgstr "Autor Micah Lee, MIT licenca"
++
++#: __init__.py:67
++#, python-brace-format
++msgid "version {0}"
++msgstr "verzija {0}"
++
++#: common.py:100
++#, python-brace-format
++msgid "Error creating {0}"
++msgstr "Greška prilikom stvaranja {0}"
++
++#: common.py:102 common.py:180
++#, python-brace-format
++msgid "{0} is not writable"
++msgstr "Nije moguće pisati u {0}"
++
++#: common.py:177
++#, python-brace-format
++msgid "Cannot create directory {0}"
++msgstr "Nije moguće stvoriti mapu {0}"
++
++#: common.py:187
++msgid "Creating GnuPG homedir"
++msgstr "Izrada početne mape za GnuPG"
++
++#: common.py:254
++#, python-format
++msgid "Could not import key with fingerprint: %s."
++msgstr "Nije bilo moguće uvesti ključ s otiskom prsta: %s."
++
++#: common.py:259
++msgid "Not all keys were imported successfully!"
++msgstr "Nisu svi ključevi uspješno uvezeni!"
++
++#: launcher.py:83
++msgid "Downloading Tor Browser for the first time."
++msgstr "Preuzimanje Tor preglednika po prvi put."
++
++#: launcher.py:85
++msgid ""
++"Your version of Tor Browser is out-of-date. Downloading the newest version."
++msgstr ""
++"Tvoja verzija Tor preglednika je zastarjela. Preuzima se najnovija verzija."
++
++#: launcher.py:100
++msgid "Downloading over Tor"
++msgstr "Preuzimanje preko Tora"
++
++#: launcher.py:111
++msgid "Tor Browser"
++msgstr "Tor preglednik"
++
++#: launcher.py:128
++msgid "Start"
++msgstr "Pokreni"
++
++#: launcher.py:174
++msgid "Yes"
++msgstr "Da"
++
++#: launcher.py:178
++msgid "Exit"
++msgstr "Zatvori"
++
++#: launcher.py:192 settings.py:136
++msgid "Cancel"
++msgstr "Odustani"
++
++#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
++#: launcher.py:281
++msgid "Downloading"
++msgstr "Preuzimanje"
++
++#: launcher.py:238
++msgid "Latest version: {}"
++msgstr "Zadnja verzija: {}"
++
++#: launcher.py:241
++msgid "Error detecting Tor Browser version."
++msgstr "Greška prilikom otkrivanja verzije Tor preglednika."
++
++#: launcher.py:256 launcher.py:357
++msgid "Verifying Signature"
++msgstr "Potvrđivanje potpisa"
++
++#: launcher.py:260
++msgid "Extracting"
++msgstr "Otpakiravanje"
++
++#: launcher.py:264
++msgid "Running"
++msgstr "Izvršava se"
++
++#: launcher.py:268
++msgid "Starting download over again"
++msgstr "Pokreće se ponovno preuzimanje"
++
++#: launcher.py:279 launcher.py:295
++msgid "(over Tor)"
++msgstr "(preko Tora)"
++
++#: launcher.py:293
++msgid "Downloaded"
++msgstr "Preuzeto"
++
++#: launcher.py:393
++msgid "Installing"
++msgstr "Instaliranje"
++
++#: launcher.py:401
++#, python-brace-format
++msgid "Tor Browser Launcher doesn't understand the file format of {0}"
++msgstr "Pokretač Tor preglednika ne razumije format datoteke {0}"
++
++#: launcher.py:427
++msgid ""
++"The version of Tor Browser you have installed is earlier than it should be, "
++"which could be a sign of an attack!"
++msgstr ""
++"Tvoja verzija Tor preglednika je starija nego što bi trebala biti, što može "
++"biti znak napada!"
++
++#: launcher.py:446
++msgid "Downloading Tor Browser over again."
++msgstr "Ponovno preuzimanje Tor preglednika."
++
++#: launcher.py:516 launcher.py:525 launcher.py:533
++msgid "Download Error:"
++msgstr "Greška prilikom preuzimanja:"
++
++#: launcher.py:517
++msgid "You are currently using a non-default mirror"
++msgstr "Trenutačno koristiš nestandardno zrcalo"
++
++#: launcher.py:518
++msgid "Would you like to switch back to the default?"
++msgstr "Želiš li vratiti na standardno?"
++
++#: launcher.py:527
++msgid "Would you like to try the English version of Tor Browser instead?"
++msgstr "Želiš li umjesto toga isprobati englesku verziju Tor preglednika?"
++
++#: launcher.py:548
++#, python-brace-format
++msgid ""
++"Invalid SSL certificate for:\n"
++"{0}\n"
++"\n"
++"You may be under attack."
++msgstr ""
++"Neispravni SSL certifikat za:\n"
++"{0}\n"
++"\n"
++"Možda si napadnut/a."
++
++#: launcher.py:550
++msgid "Try the download again using Tor?"
++msgstr "Ponovo pokušati preuzeti pomoću Tora?"
++
++#: launcher.py:559
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Trying to download over Tor. Are you sure Tor is configured correctly and "
++"running?"
++msgstr ""
++"Greška prilikom pokretanja preuzimanja:\n"
++"\n"
++"{0}\n"
++"\n"
++"Pokušava se preuzeti preko Tora. Je li je Tor ispravno konfiguriran i "
++"pokrenut?"
++
++#: launcher.py:563
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Are you connected to the internet?"
++msgstr ""
++"Greška prilikom pokretanja preuzimanja:\n"
++"\n"
++"{0}\n"
++"\n"
++"Jesi li spojen/a na internet?"
++
++#: settings.py:46
++msgid "Tor Browser Launcher Settings"
++msgstr "Postavke pokretača Tor preglednika"
++
++#: settings.py:50
++msgid "Download over system Tor"
++msgstr "Preuzmi preko Tora sustava"
++
++#: settings.py:57
++msgid "Force downloading English version of Tor Browser"
++msgstr "Prisili preuzimanje engleske verzije Tor preglednika"
++
++#: settings.py:66
++msgid "Tor server"
++msgstr "Tor poslužitelj"
++
++#: settings.py:82
++msgid "Status: Installed"
++msgstr "Stanje: Instalirano"
++
++#: settings.py:84
++msgid "Status: Not Installed"
++msgstr "Stanje: Nije instalirano"
++
++#: settings.py:87
++msgid "Install Tor Browser"
++msgstr "Instaliraj Tor preglednik"
++
++#: settings.py:92
++msgid "Reinstall Tor Browser"
++msgstr "Ponovo instaliraj Tor preglednik"
++
++#: settings.py:115
++msgid "Mirror"
++msgstr "Zrcalo"
++
++#: settings.py:131
++msgid "Save && Exit"
++msgstr "Spremi i zatvori"
=====================================
debian/patches/0025-Add-Chinese-Traditional-translation.patch
=====================================
@@ -0,0 +1,270 @@
+From: Koala Yeung <koalay at gmail.com>
+Date: Wed, 22 Apr 2020 23:34:45 +0800
+Subject: Add Chinese (Traditional) translation
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/465
+
+(cherry picked from commit 3fa7eca4136164df278cb2c131bd620677d95dbb)
+---
+ po/zh_TW.po | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 253 insertions(+)
+ create mode 100644 po/zh_TW.po
+
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+new file mode 100644
+index 0000000..aae7f26
+--- /dev/null
++++ b/po/zh_TW.po
+@@ -0,0 +1,253 @@
++# Chinese translations for PACKAGE package
++# PACKAGE 套件的正體中文翻譯.
++# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# Koala Yeung <koalay at gmail.com>, 2020.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: \n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2018-03-23 15:47-0700\n"
++"PO-Revision-Date: 2020-04-22 23:31+0800\n"
++"Last-Translator: Koala Yeung <koalay at gmail.com>\n"
++"Language-Team: Chinese (traditional)\n"
++"Language: zh_TW\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 2.3\n"
++
++#: __init__.py:65 launcher.py:470
++msgid "Tor Browser Launcher"
++msgstr "Tor 瀏覽器啟動程式"
++
++#: __init__.py:66
++msgid "By Micah Lee, licensed under MIT"
++msgstr "由 Micah Lee 編寫，以 MIT 特許授權發佈"
++
++#: __init__.py:67
++#, python-brace-format
++msgid "version {0}"
++msgstr "{0} 版"
++
++#: common.py:100
++#, python-brace-format
++msgid "Error creating {0}"
++msgstr "生成 {0} 時發生問題"
++
++#: common.py:102 common.py:180
++#, python-brace-format
++msgid "{0} is not writable"
++msgstr "無法寫入 {0}"
++
++#: common.py:177
++#, python-brace-format
++msgid "Cannot create directory {0}"
++msgstr "無法生成 {0} 目錄"
++
++#: common.py:187
++msgid "Creating GnuPG homedir"
++msgstr "生成 GnuPG 目錄"
++
++#: common.py:254
++#, python-format
++msgid "Could not import key with fingerprint: %s."
++msgstr "無法以指紋匯入加密金鑰︰%s."
++
++#: common.py:259
++msgid "Not all keys were imported successfully!"
++msgstr "只有部份加密金鑰加入成功！"
++
++#: launcher.py:83
++msgid "Downloading Tor Browser for the first time."
++msgstr "第一次下載 Tor 瀏覽器。"
++
++#: launcher.py:85
++msgid ""
++"Your version of Tor Browser is out-of-date. Downloading the newest version."
++msgstr "你目前的 Tor 瀏覽器不是最新的，正下載最新版本。"
++
++#: launcher.py:100
++msgid "Downloading over Tor"
++msgstr "透過 Tor 網絡下載"
++
++#: launcher.py:111
++msgid "Tor Browser"
++msgstr "Tor 瀏覽器"
++
++#: launcher.py:128
++msgid "Start"
++msgstr "開始"
++
++#: launcher.py:174
++msgid "Yes"
++msgstr "是"
++
++#: launcher.py:178
++msgid "Exit"
++msgstr "離開"
++
++#: launcher.py:192 settings.py:136
++msgid "Cancel"
++msgstr "取消"
++
++#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
++#: launcher.py:281
++msgid "Downloading"
++msgstr "下載中"
++
++#: launcher.py:238
++msgid "Latest version: {}"
++msgstr "最新版本︰{}"
++
++#: launcher.py:241
++msgid "Error detecting Tor Browser version."
++msgstr "偵測 Tor 瀏覽器版本時發生錯誤。"
++
++#: launcher.py:256 launcher.py:357
++msgid "Verifying Signature"
++msgstr "正在檢查數位簽章"
++
++#: launcher.py:260
++msgid "Extracting"
++msgstr "正在解開"
++
++#: launcher.py:264
++msgid "Running"
++msgstr "執行中"
++
++#: launcher.py:268
++msgid "Starting download over again"
++msgstr "從新開始下載"
++
++#: launcher.py:279 launcher.py:295
++msgid "(over Tor)"
++msgstr "(透過 Tor 網絡)"
++
++#: launcher.py:293
++msgid "Downloaded"
++msgstr "已下載"
++
++#: launcher.py:393
++msgid "Installing"
++msgstr "正在安裝"
++
++#: launcher.py:401
++#, python-brace-format
++msgid "Tor Browser Launcher doesn't understand the file format of {0}"
++msgstr "Tor 瀏覽器啟動程式不了解 {0} 的檔案格式"
++
++#: launcher.py:427
++msgid ""
++"The version of Tor Browser you have installed is earlier than it should be, "
++"which could be a sign of an attack!"
++msgstr "你已安裝的 Tor 瀏覽器版本比預期的版本早期，這表示你的電腦可能被入侵！"
++
++#: launcher.py:446
++msgid "Downloading Tor Browser over again."
++msgstr "重新下載 Tor 瀏覽器。"
++
++#: launcher.py:516 launcher.py:525 launcher.py:533
++msgid "Download Error:"
++msgstr "下載錯誤:"
++
++#: launcher.py:517
++msgid "You are currently using a non-default mirror"
++msgstr "你目前正在使用非預設的鏡像"
++
++#: launcher.py:518
++msgid "Would you like to switch back to the default?"
++msgstr "你想改為使用預設的嗎？"
++
++#: launcher.py:527
++msgid "Would you like to try the English version of Tor Browser instead?"
++msgstr "你要試試改為下載英文版 Tor 瀏覽器嗎？"
++
++#: launcher.py:548
++#, python-brace-format
++msgid ""
++"Invalid SSL certificate for:\n"
++"{0}\n"
++"\n"
++"You may be under attack."
++msgstr ""
++"以下網址的 SSL 證書不正確︰\n"
++"{0}\n"
++"\n"
++"你可能正被入侵。"
++
++#: launcher.py:550
++msgid "Try the download again using Tor?"
++msgstr "要試試改用 Tor 網絡重新下載嗎？"
++
++#: launcher.py:559
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Trying to download over Tor. Are you sure Tor is configured correctly and "
++"running?"
++msgstr ""
++"無法開始下載︰\n"
++"\n"
++"{0}\n"
++"\n"
++"請試試經由 Tor 網絡下載。你肯定你的 Tor 有正確被下載和執行嗎？"
++
++#: launcher.py:563
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Are you connected to the internet?"
++msgstr ""
++"無法開始下載︰\n"
++"\n"
++"{0}\n"
++"\n"
++"請問你是否有連上互聯網？"
++
++#: settings.py:46
++msgid "Tor Browser Launcher Settings"
++msgstr "Tor 瀏覽器啟動程式設定"
++
++#: settings.py:50
++msgid "Download over system Tor"
++msgstr "透過系統的 Tor 網絡下載"
++
++#: settings.py:57
++msgid "Force downloading English version of Tor Browser"
++msgstr "強制下載英文版本的 Tor 瀏覽器"
++
++#: settings.py:66
++msgid "Tor server"
++msgstr "Tor 伺服器"
++
++#: settings.py:82
++msgid "Status: Installed"
++msgstr "狀態︰已安裝"
++
++#: settings.py:84
++msgid "Status: Not Installed"
++msgstr "狀態︰未安裝"
++
++#: settings.py:87
++msgid "Install Tor Browser"
++msgstr "安裝 Tor 瀏覽器"
++
++#: settings.py:92
++msgid "Reinstall Tor Browser"
++msgstr "重新安裝 Tor 瀏覽器"
++
++#: settings.py:115
++msgid "Mirror"
++msgstr "鏡像"
++
++#: settings.py:131
++msgid "Save && Exit"
++msgstr "儲存及離開"
=====================================
debian/patches/series
=====================================
@@ -5,12 +5,21 @@
0005-Fix-two-spelling-errors.patch
0006-Add-Swedish-translation.patch
0007-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
-0008-Revert-Properly-detect-the-system-s-locale.patch
+0008-pt_BR-translation.patch
0009-pt_BR-translation.patch
-0010-pt_BR-translation.patch
-0011-Update-French-translation.patch
-0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
-0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
-0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
-0015-Update-setup.py.patch
-0016-AppArmor-allow-u2f-devices.patch
+0010-Update-French-translation.patch
+0011-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
+0012-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
+0013-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
+0014-Update-setup.py.patch
+0015-AppArmor-allow-u2f-devices.patch
+0016-Silence-the-deny-apparmor-log-from-lsb_release.patch
+0017-Set-language-from-LC_MESSAGES-not-LC_CTYPE.patch
+0018-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch
+0019-Fix-language-fallback-for-Chinese-Hong-Kong.patch
+0020-Add-da-to-torbrowser.desktop.patch
+0021-Add-da-to-torbrowser-settings.desktop.patch
+0022-Belarusian-localization-is-added.patch
+0023-Added-de.po.patch
+0024-Added-hr.po.patch
+0025-Add-Chinese-Traditional-translation.patch
=====================================
debian/rules
=====================================
@@ -7,7 +7,7 @@ include /usr/share/dpkg/pkg-info.mk
override_dh_auto_install:
dh_auto_install
- rm -r debian/*/etc/apparmor.d/local
+ rm -rf debian/*/etc/apparmor.d/local
override_dh_install:
for PROFILE in torbrowser.Tor.tor torbrowser.Browser.firefox ; do \
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/ec7a95fd5ab304cb241ec99df7f7885740d3fad7...0c57b8f22de9eefb285c2eea8ca4880931da76d5
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/ec7a95fd5ab304cb241ec99df7f7885740d3fad7...0c57b8f22de9eefb285c2eea8ca4880931da76d5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20200426/745c6873/attachment-0001.html>
More information about the Pkg-privacy-commits
mailing list