- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29859: Disable HLS support for now
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 477af8c709134b57b530b4b94ce6b4c82cb46fce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 28 19:10:34 2019 +0000 Bug 29859: Disable HLS support for now --- mobile/android/app/000-tor-browser-android.js | 3 +++ mobile/android/moz.configure | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index de51ec125406..b2ee9d0ded00 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -56,3 +56,6 @@ pref("general.useragent.updates.url", ""); // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2); + +// No HLS support for now due to browser freezing, see: #29859. +pref("media.hls.enabled", false); diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 7033d4283211..d0347b5fe0b8 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -96,7 +96,7 @@ project_flag('MOZ_SWITCHBOARD', project_flag('MOZ_ANDROID_HLS_SUPPORT', help='Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)', - default=True) + default=False) option(env='MOZ_ANDROID_ACTIVITY_STREAM', help='Enable Activity Stream on Android (replacing the default HomePager)',

1 0

[tor-browser-build/master] Bug 28622: Update Tor Browser icon for Android
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 300c55e5e0cf8e24f49959eababd2c7d9fc056ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 20 11:11:39 2019 +0000 Bug 28622: Update Tor Browser icon for Android --- projects/firefox/config | 6 +++--- projects/firefox/mozconfig-android-armv7 | 1 - projects/firefox/mozconfig-android-x86 | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 679aaee..bd09c5f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -12,7 +12,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha - branding_directory: browser/branding/alpha + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential @@ -44,14 +44,14 @@ targets: release: var: torbrowser_update_channel: release - branding_directory: browser/branding/official + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default - branding_directory: browser/branding/nightly + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' android: var: diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 8cfcc60..dfa3aaf 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle ac_add_options --with-android-version=16 -ac_add_options --with-branding=mobile/android/branding/torbrowser # Android NDK does not contain llvm-config so set clang path in options ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64 diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index 1fe0b93..defe5c3 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle ac_add_options --with-android-version=16 -ac_add_options --with-branding=mobile/android/branding/torbrowser # Android NDK does not contain llvm-config so set clang path in options ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64

1 0

[tor-browser-build/master] Merge branch 'bug_28622_v2'
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit bfc677fcd93dc80c062a0dfe3e93115808f09480 Merge: 3ba2100 300c55e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 11 13:57:29 2019 +0000 Merge branch 'bug_28622_v2' projects/firefox/config | 6 +++--- projects/firefox/mozconfig-android-armv7 | 1 - projects/firefox/mozconfig-android-x86 | 1 - 3 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28622: Update Tor Browser icon for mobile
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 099b6fcae28c60e96e7c24fd54ca7da14b00510f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 28 15:12:37 2019 +0000 Bug 28622: Update Tor Browser icon for mobile We follow the desktop layout by providing icons for stable, alpha, and nightly versions in the official, alpha, and nightly branding directories, replacing related Firefox icons. Moreover, this patch adjusts the displayed app name as well according to the respective Tor Browser flavor being used. There is no drawable-mdpi directory in Fennec anymore. Thus, we won't ship new icons for that either and we remove the old torbrowser branding directory and contents as those are not needed for the new layout. At some point we could do a proper clean-up of icons we actually don't need. For instance, right now we still need to ship the firstrun_welcome.png icon from Fennec's onboarding because otherwise compilation breaks, even though we have our own, Fennec unrelated onboarding. But that's part of a different ticket. --- .../branding/{torbrowser => alpha}/configure.sh | 2 +- mobile/android/branding/alpha/content/about.png | Bin 0 -> 30131 bytes mobile/android/branding/alpha/content/favicon32.png | Bin 0 -> 1761 bytes mobile/android/branding/alpha/content/favicon64.png | Bin 0 -> 4950 bytes .../branding/{torbrowser => alpha}/content/jar.mn | 2 +- .../{torbrowser/locales => alpha/content}/moz.build | 4 ++-- .../{torbrowser => alpha}/locales/en-US/brand.dtd | 8 ++++---- .../locales/en-US/brand.properties} | 3 ++- .../branding/{torbrowser => alpha}/locales/jar.mn | 2 +- .../{torbrowser/content => alpha/locales}/moz.build | 4 ++-- .../branding/{torbrowser => alpha}/moz.build | 2 +- .../branding/alpha/res/drawable-hdpi/icon.png | Bin 0 -> 6007 bytes .../branding/alpha/res/drawable-hdpi/large_icon.png | Bin 0 -> 15169 bytes .../res/drawable-nodpi/figure_experience.png | Bin .../res/drawable-nodpi/figure_network.png | Bin .../res/drawable-nodpi/figure_onion.png | Bin .../res/drawable-nodpi/figure_privacy.png | Bin .../res/drawable-nodpi/figure_security.png | Bin .../res/drawable-nodpi/figure_welcome.png | Bin .../alpha/res/drawable-nodpi/firstrun_welcome.png | Bin 0 -> 50140 bytes .../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin .../branding/alpha/res/drawable-xhdpi/icon.png | Bin 0 -> 8778 bytes .../alpha/res/drawable-xhdpi/large_icon.png | Bin 0 -> 22987 bytes .../branding/alpha/res/drawable-xxhdpi/icon.png | Bin 0 -> 16140 bytes .../alpha/res/drawable-xxhdpi/large_icon.png | Bin 0 -> 41886 bytes .../branding/alpha/res/drawable-xxxhdpi/icon.png | Bin 0 -> 24683 bytes mobile/android/branding/nightly/configure.sh | 10 ++++------ .../android/branding/nightly/content/favicon32.png | Bin 2020 -> 1928 bytes .../android/branding/nightly/content/favicon64.png | Bin 5152 -> 5398 bytes .../branding/nightly/res/drawable-hdpi/icon.png | Bin 6307 -> 6578 bytes .../nightly/res/drawable-hdpi/large_icon.png | Bin 14582 -> 17085 bytes .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../nightly/res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../nightly/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../nightly/res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../nightly/res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes .../nightly/res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes .../branding/nightly/res/drawable-xhdpi/icon.png | Bin 9490 -> 9884 bytes .../nightly/res/drawable-xhdpi/large_icon.png | Bin 20843 -> 26206 bytes .../branding/nightly/res/drawable-xxhdpi/icon.png | Bin 16480 -> 18335 bytes .../nightly/res/drawable-xxhdpi/large_icon.png | Bin 36066 -> 49974 bytes .../branding/nightly/res/drawable-xxxhdpi/icon.png | Bin 24541 -> 28434 bytes mobile/android/branding/official/configure.sh | 7 ++----- .../android/branding/official/content/favicon32.png | Bin 2240 -> 2018 bytes .../android/branding/official/content/favicon64.png | Bin 5324 -> 5527 bytes .../branding/official/res/drawable-hdpi/icon.png | Bin 6136 -> 6634 bytes .../official/res/drawable-hdpi/large_icon.png | Bin 14818 -> 17467 bytes .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../official/res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../official/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../official/res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../official/res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes .../official/res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../res/drawable-nodpi/firstrun_welcome.png | Bin 48391 -> 50140 bytes .../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes .../branding/official/res/drawable-xhdpi/icon.png | Bin 8877 -> 9814 bytes .../official/res/drawable-xhdpi/large_icon.png | Bin 21192 -> 26333 bytes .../branding/official/res/drawable-xxhdpi/icon.png | Bin 14818 -> 17467 bytes .../official/res/drawable-xxhdpi/large_icon.png | Bin 34638 -> 46598 bytes .../branding/official/res/drawable-xxxhdpi/icon.png | Bin 21192 -> 26333 bytes .../android/branding/torbrowser/content/about.png | Bin 16858 -> 0 bytes .../branding/torbrowser/content/favicon32.png | Bin 1797 -> 0 bytes .../branding/torbrowser/content/favicon64.png | Bin 3993 -> 0 bytes mobile/android/branding/torbrowser/ic_launcher.zip | Bin 96525 -> 0 bytes mobile/android/branding/torbrowser/icon.png | Bin 36456 -> 0 bytes .../torbrowser/locales/en-US/brand.properties | 7 ------- .../branding/torbrowser/res/drawable-hdpi/icon.png | Bin 3549 -> 0 bytes .../torbrowser/res/drawable-hdpi/large_icon.png | Bin 9558 -> 0 bytes .../res/drawable-hdpi/launcher_widget.png | Bin 14001 -> 0 bytes .../branding/torbrowser/res/drawable-mdpi/icon.png | Bin 2577 -> 0 bytes .../torbrowser/res/drawable-mdpi/large_icon.png | Bin 5878 -> 0 bytes .../res/drawable-mdpi/launcher_widget.png | Bin 7661 -> 0 bytes .../res/drawable-nodpi/firstrun_welcome.png | Bin 48391 -> 0 bytes .../branding/torbrowser/res/drawable-xhdpi/icon.png | Bin 5878 -> 0 bytes .../torbrowser/res/drawable-xhdpi/large_icon.png | Bin 13553 -> 0 bytes .../res/drawable-xhdpi/launcher_widget.png | Bin 21223 -> 0 bytes .../torbrowser/res/drawable-xhdpi/widget_icon.png | Bin 4381 -> 0 bytes .../torbrowser/res/drawable-xxhdpi/icon.png | Bin 9558 -> 0 bytes .../torbrowser/res/drawable-xxhdpi/large_icon.png | Bin 13553 -> 0 bytes .../res/drawable-xxhdpi/launcher_widget.png | Bin 32686 -> 0 bytes .../torbrowser/res/drawable-xxxhdpi/icon.png | Bin 13553 -> 0 bytes mobile/android/branding/torbrowser/torbrowser.png | Bin 55962 -> 0 bytes mobile/android/branding/torbrowser/torbrowser.xcf | Bin 267775 -> 0 bytes 84 files changed, 20 insertions(+), 31 deletions(-) diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/alpha/configure.sh similarity index 100% rename from mobile/android/branding/torbrowser/configure.sh rename to mobile/android/branding/alpha/configure.sh index 5e2dbfc15cf9..1fd6385c5a06 100644 --- a/mobile/android/branding/torbrowser/configure.sh +++ b/mobile/android/branding/alpha/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)" +ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/alpha/content/about.png b/mobile/android/branding/alpha/content/about.png new file mode 100644 index 000000000000..2ca32a355fcd Binary files /dev/null and b/mobile/android/branding/alpha/content/about.png differ diff --git a/mobile/android/branding/alpha/content/favicon32.png b/mobile/android/branding/alpha/content/favicon32.png new file mode 100644 index 000000000000..f3183767da37 Binary files /dev/null and b/mobile/android/branding/alpha/content/favicon32.png differ diff --git a/mobile/android/branding/alpha/content/favicon64.png b/mobile/android/branding/alpha/content/favicon64.png new file mode 100644 index 000000000000..56831e8ad596 Binary files /dev/null and b/mobile/android/branding/alpha/content/favicon64.png differ diff --git a/mobile/android/branding/torbrowser/content/jar.mn b/mobile/android/branding/alpha/content/jar.mn similarity index 87% rename from mobile/android/branding/torbrowser/content/jar.mn rename to mobile/android/branding/alpha/content/jar.mn index f934ed5e4634..e49cc40416a0 100644 --- a/mobile/android/branding/torbrowser/content/jar.mn +++ b/mobile/android/branding/alpha/content/jar.mn @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. chrome.jar: -% content branding %content/branding/ +% content branding %content/branding/ contentaccessible=yes content/branding/about.png (about.png) content/branding/favicon32.png (favicon32.png) content/branding/favicon64.png (favicon64.png) diff --git a/mobile/android/branding/torbrowser/locales/moz.build b/mobile/android/branding/alpha/content/moz.build similarity index 67% rename from mobile/android/branding/torbrowser/locales/moz.build rename to mobile/android/branding/alpha/content/moz.build index 3bbe6729759c..eb4454d28f88 100644 --- a/mobile/android/branding/torbrowser/locales/moz.build +++ b/mobile/android/branding/alpha/content/moz.build @@ -1,7 +1,7 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -JAR_MANIFESTS += ['jar.mn'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd similarity index 55% rename from mobile/android/branding/torbrowser/locales/en-US/brand.dtd rename to mobile/android/branding/alpha/locales/en-US/brand.dtd index 01346be36a7c..c92ea3503046 100644 --- a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd +++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> -<!ENTITY vendorShortName "The Tor Project"> +<!ENTITY brandShortName "Nightly"> +<!ENTITY brandFullName "Mozilla Nightly"> +<!ENTITY vendorShortName "Mozilla"> -<!ENTITY brandPocket ""> +<!ENTITY brandPocket "Pocket"> diff --git a/mobile/android/branding/torbrowser/locales/Makefile.in b/mobile/android/branding/alpha/locales/en-US/brand.properties similarity index 79% rename from mobile/android/branding/torbrowser/locales/Makefile.in rename to mobile/android/branding/alpha/locales/en-US/brand.properties index 82f614ecea29..d06053614729 100644 --- a/mobile/android/branding/torbrowser/locales/Makefile.in +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -2,4 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEFINES += -DAB_CD=$(AB_CD) +brandShortName=Nightly +brandFullName=Mozilla Nightly diff --git a/mobile/android/branding/torbrowser/locales/jar.mn b/mobile/android/branding/alpha/locales/jar.mn similarity index 86% rename from mobile/android/branding/torbrowser/locales/jar.mn rename to mobile/android/branding/alpha/locales/jar.mn index 825dabbfb470..5a77695c91aa 100644 --- a/mobile/android/branding/torbrowser/locales/jar.mn +++ b/mobile/android/branding/alpha/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/torbrowser/content/moz.build b/mobile/android/branding/alpha/locales/moz.build similarity index 67% rename from mobile/android/branding/torbrowser/content/moz.build rename to mobile/android/branding/alpha/locales/moz.build index 3bbe6729759c..eb4454d28f88 100644 --- a/mobile/android/branding/torbrowser/content/moz.build +++ b/mobile/android/branding/alpha/locales/moz.build @@ -1,7 +1,7 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -JAR_MANIFESTS += ['jar.mn'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/mobile/android/branding/torbrowser/moz.build b/mobile/android/branding/alpha/moz.build similarity index 76% rename from mobile/android/branding/torbrowser/moz.build rename to mobile/android/branding/alpha/moz.build index 8f320daeae90..04084b1ace0f 100644 --- a/mobile/android/branding/torbrowser/moz.build +++ b/mobile/android/branding/alpha/moz.build @@ -1,4 +1,4 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/mobile/android/branding/alpha/res/drawable-hdpi/icon.png b/mobile/android/branding/alpha/res/drawable-hdpi/icon.png new file mode 100644 index 000000000000..4b8a5d2e48b6 Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-hdpi/icon.png differ diff --git a/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png new file mode 100644 index 000000000000..50f8777fc058 Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_experience.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_experience.png diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_network.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_network.png diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_onion.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_onion.png diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_privacy.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_privacy.png diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_security.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_security.png diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_welcome.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_welcome.png diff --git a/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png new file mode 100644 index 000000000000..5c9093331cff Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/alpha/res/drawable-nodpi/home_tab_menu_strip_tor.9.png similarity index 100% rename from mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png rename to mobile/android/branding/alpha/res/drawable-nodpi/home_tab_menu_strip_tor.9.png diff --git a/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000000..1bae7fa5fe70 Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png differ diff --git a/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png new file mode 100644 index 000000000000..371a1734d87c Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png differ diff --git a/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000000..df944c11d700 Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png differ diff --git a/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png new file mode 100644 index 000000000000..5e9bc0036a0d Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png differ diff --git a/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000000..88005f727968 Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png differ diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh index 69ef1f6b00d0..47761caf31f4 100644 --- a/mobile/android/branding/nightly/configure.sh +++ b/mobile/android/branding/nightly/configure.sh @@ -2,9 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Firefox Nightly" -MOZ_UPDATER=1 -MOZ_ANDROID_ANR_REPORTER=1 -MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID -MOZ_ANDROID_GCM_SENDERID=965234145045 -MOZ_MMA_GCM_SENDERID=242693410970 \ No newline at end of file +MOZ_APP_DISPLAYNAME="Tor Browser for Android (Nightly)" +ANDROID_PACKAGE_NAME=org.torproject.torbrowser_nightly +MOZ_UPDATER= +MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/nightly/content/favicon32.png b/mobile/android/branding/nightly/content/favicon32.png index 23830c03fcd5..1331164c81f0 100644 Binary files a/mobile/android/branding/nightly/content/favicon32.png and b/mobile/android/branding/nightly/content/favicon32.png differ diff --git a/mobile/android/branding/nightly/content/favicon64.png b/mobile/android/branding/nightly/content/favicon64.png index d2214dcefe9a..eae8d730594e 100644 Binary files a/mobile/android/branding/nightly/content/favicon64.png and b/mobile/android/branding/nightly/content/favicon64.png differ diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png index 68e024ad268a..756d37856e19 100644 Binary files a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png index 2ffc0ca909b9..6ce99c3a2124 100644 Binary files a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png new file mode 100644 index 000000000000..2eeeb1ccbd7d Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png new file mode 100644 index 000000000000..62bf5e2d144d Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png new file mode 100644 index 000000000000..cbd8236f82e9 Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png new file mode 100644 index 000000000000..d9d56229aa8a Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png new file mode 100644 index 000000000000..0a0d47f75370 Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png new file mode 100644 index 000000000000..274dea5c31a6 Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png differ diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png new file mode 100644 index 000000000000..a92420d11b8e Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png index 0b5e1a175255..03fe48da2707 100644 Binary files a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png index 12f87594365c..f54c241c56eb 100644 Binary files a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png index 1ee12f2419eb..1288d3f106b0 100644 Binary files a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png index 37ac9d067e92..f5ffff4cd6b1 100644 Binary files a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png differ diff --git a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png index 9128552b390e..d7d3f99c1d2c 100644 Binary files a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png differ diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh index 5687537d358e..aa8b56336ccc 100644 --- a/mobile/android/branding/official/configure.sh +++ b/mobile/android/branding/official/configure.sh @@ -2,10 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME=Firefox -ANDROID_PACKAGE_NAME=org.mozilla.firefox +MOZ_APP_DISPLAYNAME="Tor Browser for Android" +ANDROID_PACKAGE_NAME=org.torproject.torbrowser MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= -MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID -MOZ_ANDROID_GCM_SENDERID=965234145045 -MOZ_MMA_GCM_SENDERID=242693410970 \ No newline at end of file diff --git a/mobile/android/branding/official/content/favicon32.png b/mobile/android/branding/official/content/favicon32.png index b6eb66068725..06992a00bc3e 100644 Binary files a/mobile/android/branding/official/content/favicon32.png and b/mobile/android/branding/official/content/favicon32.png differ diff --git a/mobile/android/branding/official/content/favicon64.png b/mobile/android/branding/official/content/favicon64.png index 1a8fc1ad0a65..4ef62a9617df 100644 Binary files a/mobile/android/branding/official/content/favicon64.png and b/mobile/android/branding/official/content/favicon64.png differ diff --git a/mobile/android/branding/official/res/drawable-hdpi/icon.png b/mobile/android/branding/official/res/drawable-hdpi/icon.png index 370202c13fc7..8211871aae67 100644 Binary files a/mobile/android/branding/official/res/drawable-hdpi/icon.png and b/mobile/android/branding/official/res/drawable-hdpi/icon.png differ diff --git a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png index 1815e0cabea9..bb81f8772b6d 100644 Binary files a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png new file mode 100644 index 000000000000..2eeeb1ccbd7d Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_network.png b/mobile/android/branding/official/res/drawable-nodpi/figure_network.png new file mode 100644 index 000000000000..62bf5e2d144d Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_network.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png new file mode 100644 index 000000000000..cbd8236f82e9 Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png new file mode 100644 index 000000000000..d9d56229aa8a Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_security.png b/mobile/android/branding/official/res/drawable-nodpi/figure_security.png new file mode 100644 index 000000000000..0a0d47f75370 Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_security.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png new file mode 100644 index 000000000000..274dea5c31a6 Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png index e4e84187e891..5c9093331cff 100644 Binary files a/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png and b/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png differ diff --git a/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png new file mode 100644 index 000000000000..a92420d11b8e Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ diff --git a/mobile/android/branding/official/res/drawable-xhdpi/icon.png b/mobile/android/branding/official/res/drawable-xhdpi/icon.png index 6da9415761f0..39195e143042 100644 Binary files a/mobile/android/branding/official/res/drawable-xhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xhdpi/icon.png differ diff --git a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png index 3094479498bb..25d490e2fc0e 100644 Binary files a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png differ diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png index 1815e0cabea9..bb81f8772b6d 100644 Binary files a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png differ diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png index 0e2f73cb2ad4..d03e22132ffb 100644 Binary files a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png differ diff --git a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png index 3094479498bb..25d490e2fc0e 100644 Binary files a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/content/about.png b/mobile/android/branding/torbrowser/content/about.png deleted file mode 100644 index 3819f6337a17..000000000000 Binary files a/mobile/android/branding/torbrowser/content/about.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/content/favicon32.png b/mobile/android/branding/torbrowser/content/favicon32.png deleted file mode 100644 index 0c414d6ca46b..000000000000 Binary files a/mobile/android/branding/torbrowser/content/favicon32.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/content/favicon64.png b/mobile/android/branding/torbrowser/content/favicon64.png deleted file mode 100644 index bfc9e05538c6..000000000000 Binary files a/mobile/android/branding/torbrowser/content/favicon64.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/ic_launcher.zip b/mobile/android/branding/torbrowser/ic_launcher.zip deleted file mode 100644 index 69601344519e..000000000000 Binary files a/mobile/android/branding/torbrowser/ic_launcher.zip and /dev/null differ diff --git a/mobile/android/branding/torbrowser/icon.png b/mobile/android/branding/torbrowser/icon.png deleted file mode 100644 index 6e0051b95a32..000000000000 Binary files a/mobile/android/branding/torbrowser/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.properties b/mobile/android/branding/torbrowser/locales/en-US/brand.properties deleted file mode 100644 index 3015d2376518..000000000000 --- a/mobile/android/branding/torbrowser/locales/en-US/brand.properties +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#filter -brandShortName=Tor Browser -brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png deleted file mode 100644 index 2a1dc9aea83d..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png deleted file mode 100644 index 946e03e42d0b..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png deleted file mode 100644 index 4d7dc659a565..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png deleted file mode 100644 index 78ace1c9b6d3..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png deleted file mode 100644 index 8e45a100870b..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png deleted file mode 100644 index 23d966478fdf..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png deleted file mode 100644 index e4e84187e891..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png deleted file mode 100644 index 8e45a100870b..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png deleted file mode 100644 index d3a4929e7503..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png deleted file mode 100644 index beff04f1fc1d..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png deleted file mode 100644 index ef76eb342035..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png deleted file mode 100644 index 946e03e42d0b..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png deleted file mode 100644 index d3a4929e7503..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png deleted file mode 100644 index 279af3fff38b..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png deleted file mode 100644 index d3a4929e7503..000000000000 Binary files a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/torbrowser.png b/mobile/android/branding/torbrowser/torbrowser.png deleted file mode 100644 index 6c6d906aa044..000000000000 Binary files a/mobile/android/branding/torbrowser/torbrowser.png and /dev/null differ diff --git a/mobile/android/branding/torbrowser/torbrowser.xcf b/mobile/android/branding/torbrowser/torbrowser.xcf deleted file mode 100644 index 2a8f829c3c34..000000000000 Binary files a/mobile/android/branding/torbrowser/torbrowser.xcf and /dev/null differ

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28622: Update Tor Browser icon for mobile
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 80e82b14804f677dd89a63a79d42f420ab9ccb7d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 10 20:29:15 2019 +0000 fixup! Bug 28622: Update Tor Browser icon for mobile --- mobile/android/branding/alpha/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/alpha/locales/en-US/brand.properties | 4 ++-- mobile/android/branding/nightly/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/nightly/locales/en-US/brand.properties | 4 ++-- mobile/android/branding/official/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/official/locales/en-US/brand.properties | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd index c92ea3503046..01346be36a7c 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.dtd +++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Nightly"> -<!ENTITY brandFullName "Mozilla Nightly"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> -<!ENTITY brandPocket "Pocket"> +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties index d06053614729..12ebf8a5d205 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.properties +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -2,5 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Nightly -brandFullName=Mozilla Nightly +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd index c92ea3503046..01346be36a7c 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.dtd +++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Nightly"> -<!ENTITY brandFullName "Mozilla Nightly"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> -<!ENTITY brandPocket "Pocket"> +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties index d06053614729..12ebf8a5d205 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.properties +++ b/mobile/android/branding/nightly/locales/en-US/brand.properties @@ -2,5 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Nightly -brandFullName=Mozilla Nightly +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd index 59009128a273..01346be36a7c 100644 --- a/mobile/android/branding/official/locales/en-US/brand.dtd +++ b/mobile/android/branding/official/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Firefox"> -<!ENTITY brandFullName "Mozilla Firefox"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> -<!ENTITY brandPocket "Pocket"> +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties index d0203e35a492..12ebf8a5d205 100644 --- a/mobile/android/branding/official/locales/en-US/brand.properties +++ b/mobile/android/branding/official/locales/en-US/brand.properties @@ -2,5 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Firefox -brandFullName=Mozilla Firefox +brandShortName=Tor Browser +brandFullName=Tor Browser for Android

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29238 - Prevent crash on Android after update
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit bfa54eb8ac5dc923527f07e48d0a390314991fd3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 22 16:24:09 2019 +0000 Bug 29238 - Prevent crash on Android after update --- mobile/android/base/AndroidManifest.xml.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 01b23d22a19b..c9a65da1ea1f 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -415,14 +415,6 @@ android:name="org.mozilla.gecko.cleanup.FileCleanupService"> </service> - <receiver - android:name="org.mozilla.gecko.PackageReplacedReceiver" - android:exported="false"> - <intent-filter> - <action android:name="android.intent.action.MY_PACKAGE_REPLACED"></action> - </intent-filter> - </receiver> - <service android:name="org.mozilla.gecko.telemetry.TelemetryUploadService" android:exported="false"/>

1 0

[tor-browser-build/master] Merge branch 'bug_29843'
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 3ba210064197298ad1c54ca74f086a67653109a2 Merge: 516887a b619af7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 11 10:23:30 2019 +0000 Merge branch 'bug_29843' projects/firefox/1527534.patch | 139 +++++++++++++++++++++++++++++++++++++++++ projects/firefox/build | 6 ++ projects/firefox/config | 2 + 3 files changed, 147 insertions(+) diff --cc projects/firefox/config index 9eabf05,41f7fbd..c455d21 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -166,6 -166,5 +166,8 @@@ input_files - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - project: tba-translation + name: tba-translation + enable: '[% c("var/android") %]' + - filename: 1527534.patch + enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Bug 29843: Backport the fix for bug 1527534
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit b619af79d04bde9313d8a4a2696c4a5a06c60175 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 21 15:06:04 2019 +0000 Bug 29843: Backport the fix for bug 1527534 --- projects/firefox/1527534.patch | 139 +++++++++++++++++++++++++++++++++++++++++ projects/firefox/build | 6 ++ projects/firefox/config | 2 + 3 files changed, 147 insertions(+) diff --git a/projects/firefox/1527534.patch b/projects/firefox/1527534.patch new file mode 100644 index 0000000..ad8720c --- /dev/null +++ b/projects/firefox/1527534.patch @@ -0,0 +1,139 @@ +From dcd5a0e59bef209aa8301a427b749830876cdada Mon Sep 17 00:00:00 2001 +From: Jeff Gilbert <jgilbert(a)mozilla.com> +Date: Tue, 19 Feb 2019 15:43:39 -0800 +Subject: [PATCH] Bug 1527534 - Reuse LoadApitraceLibrary. r=lsalzman a=lizzard + +Differential Revision: https://phabricator.services.mozilla.com/D20418 + +diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp +index d91d03aee6a9..f4d8c1f80176 100644 +--- a/gfx/gl/GLContextProviderEGL.cpp ++++ b/gfx/gl/GLContextProviderEGL.cpp +@@ -265,11 +265,8 @@ GLContextEGL::~GLContextEGL() { + } + + bool GLContextEGL::Init() { +-#if defined(ANDROID) +- // We can't use LoadApitraceLibrary here because the GLContext +- // expects its own handle to the GL library +- if (!OpenLibrary(APITRACE_LIB)) +-#endif ++ mLibrary = LoadApitraceLibrary(); ++ if (!mLibrary) { + if (!OpenLibrary(GLES2_LIB)) { + #if defined(XP_UNIX) + if (!OpenLibrary(GLES2_LIB2)) { +@@ -278,6 +275,7 @@ bool GLContextEGL::Init() { + } + #endif + } ++ } + + SetupLookupFunction(); + if (!InitWithPrefix("gl", true)) return false; +diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp +index fe4bd9811949..ef693e283968 100644 +--- a/gfx/gl/GLLibraryEGL.cpp ++++ b/gfx/gl/GLLibraryEGL.cpp +@@ -63,9 +63,18 @@ static const char* sEGLExtensionNames[] = { + "EGL_ANGLE_device_creation_d3d11", + }; + +-#if defined(ANDROID) ++PRLibrary* LoadApitraceLibrary() { ++ const char* path = nullptr; ++ ++#ifdef ANDROID ++ // We only need to explicitly dlopen egltrace ++ // on android as we can use LD_PRELOAD or other tricks ++ // on other platforms. We look for it in /data/local ++ // as that's writeable by all users. ++ path = "/data/local/tmp/egltrace.so"; ++#endif ++ if (!path) return nullptr; + +-static PRLibrary* LoadApitraceLibrary() { + // Initialization of gfx prefs here is only needed during the unit tests... + gfxPrefs::GetSingleton(); + if (!gfxPrefs::UseApitrace()) { +@@ -73,7 +82,6 @@ static PRLibrary* LoadApitraceLibrary() { + } + + static PRLibrary* sApitraceLibrary = nullptr; +- + if (sApitraceLibrary) return sApitraceLibrary; + + nsAutoCString logFile; +@@ -87,20 +95,19 @@ static PRLibrary* LoadApitraceLibrary() { + nsAutoCString logPath; + logPath.AppendPrintf("%s/%s", getenv("GRE_HOME"), logFile.get()); + ++#ifndef XP_WIN // Windows is missing setenv and forbids PR_LoadLibrary. + // apitrace uses the TRACE_FILE environment variable to determine where + // to log trace output to + printf_stderr("Logging GL tracing output to %s", logPath.get()); + setenv("TRACE_FILE", logPath.get(), false); + +- printf_stderr("Attempting load of %s\n", APITRACE_LIB); +- +- sApitraceLibrary = PR_LoadLibrary(APITRACE_LIB); ++ printf_stderr("Attempting load of %s\n", path); ++ sApitraceLibrary = PR_LoadLibrary(path); ++#endif + + return sApitraceLibrary; + } + +-#endif // ANDROID +- + #ifdef XP_WIN + // see the comment in GLLibraryEGL::EnsureInitialized() for the rationale here. + static PRLibrary* LoadLibraryForEGLOnWindows(const nsAString& filename) { +diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h +index 069a2f0908d7..3f200bf76b3f 100644 +--- a/gfx/gl/GLLibraryEGL.h ++++ b/gfx/gl/GLLibraryEGL.h +@@ -18,18 +18,6 @@ + #include <bitset> + #include <vector> + +-#ifdef ANDROID +-// We only need to explicitly dlopen egltrace +-// on android as we can use LD_PRELOAD or other tricks +-// on other platforms. We look for it in /data/local +-// as that's writeable by all users +-// +-// This should really go in GLLibraryEGL.cpp but we currently reference +-// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring +-// will come in subsequent patches on Bug 732865 +-#define APITRACE_LIB "/data/local/tmp/egltrace.so" +-#endif +- + #if defined(MOZ_X11) + #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay()) + #else +@@ -49,6 +37,7 @@ class DataSourceSurface; + namespace gl { + + class GLContext; ++PRLibrary* LoadApitraceLibrary(); + + void BeforeEGLCall(const char* funcName); + void AfterEGLCall(const char* funcName); +diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h +index b2e094672b59..fae5bec1e78e 100644 +--- a/gfx/thebes/gfxPrefs.h ++++ b/gfx/thebes/gfxPrefs.h +@@ -433,9 +433,7 @@ class gfxPrefs final { + SmoothScrollMSDPhysicsRegularSpringConstant, int32_t, 1000); + + DECL_GFX_PREF(Once, "gfx.android.rgb16.force", AndroidRGB16Force, bool, false); +-#if defined(ANDROID) + DECL_GFX_PREF(Once, "gfx.apitrace.enabled", UseApitrace, bool, false); +-#endif + #if defined(RELEASE_OR_BETA) + // "Skip" means this is locked to the default value in beta and release. + DECL_GFX_PREF(Skip, "gfx.blocklist.all", BlocklistAll, int32_t, 0); +-- +2.20.1 + diff --git a/projects/firefox/build b/projects/firefox/build index 9bc025a..96cba10 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -153,6 +153,12 @@ fi patch -p1 < $rootdir/nsis-uninstall.patch [% END -%] +# Backporting a sec-high bugfix to ESR 60, but making sure it is only applied to +# mobile, as desktop ESR has not seen any testing with this mobile-related patch +[% IF c("var/android") %] + patch -p1 < $rootdir/1527534.patch +[% END -%] + rm -f configure rm -f js/src/configure diff --git a/projects/firefox/config b/projects/firefox/config index 9c85fcb..41f7fbd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -166,3 +166,5 @@ input_files: - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - filename: 1527534.patch + enable: '[% c("var/android") %]'

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 1. Add new Tor resources
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit be91c6f0a5cba14a7ba0e17682b158ada97667be Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Apr 9 17:53:01 2019 +0000 fixup! Bug 28329 - Part 1. Add new Tor resources --- mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml index 6bcc52f87f93..e0909237886c 100644 --- a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml +++ b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <vector android:height="24dp" android:viewportHeight="289" - android:viewportWidth="247" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + android:viewportWidth="249" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M100.02,44.97C96.2,31.15 83.92,21.59 69.91,21.51V0c16.52,0 32.07,7.97 41.98,21.51V0h20.99v21.51C142.78,7.97 158.33,0 174.85,0v21.51c-14.01,0.08 -26.29,9.63 -30.12,23.45C203.49,54.97 41.26,54.97 100.02,44.97z"/> <path android:fillColor="#FF000000" android:pathData="M123.92,52.47c-62.22,0 -112.65,50.44 -112.65,112.65c0,62.22 50.44,112.65 112.65,112.65V52.47z"/> <path android:fillColor="#FF000000" android:pathData="M123.92,266.51c56,0 101.39,-45.39 101.39,-101.39c0,-56 -45.39,-101.39 -101.39,-101.39S22.53,109.13 22.53,165.12C22.53,221.12 67.92,266.51 123.92,266.51zM123.92,289.04C55.48,289.04 0,233.56 0,165.12S55.48,41.2 123.92,41.2s123.92,55.48 123.92,123.92S192.36,289.04 123.92,289.04z"/>

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 7b5f5ee887cd6fd865e86784ad536b4c0136ce83 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Apr 9 17:52:28 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens --- .../app/src/main/res/layout/tor_bootstrap.xml | 9 +- .../base/java/org/mozilla/gecko/BrowserApp.java | 2 +- .../gecko/torbootstrap/TorBootstrapPanel.java | 203 +++++++++++++++++---- .../mozilla/gecko/torbootstrap/TorPreferences.java | 13 +- 4 files changed, 176 insertions(+), 51 deletions(-) diff --git a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml index ce2b1c910a44..af9c7d11d3f2 100644 --- a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml +++ b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml @@ -74,13 +74,10 @@ android:tint="#ffffffff" android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_marginTop="130dp" android:layout_marginBottom="37dp" - android:layout_marginRight="95dp" - android:layout_marginLeft="95dp" + android:layout_marginRight="10dp" + android:layout_marginLeft="10dp" android:layout_centerHorizontal="true" android:layout_below="@id/tor_bootstrap_settings_gear" - android:layout_above="@id/tor_bootstrap_last_status_message" - android:paddingLeft="20dp" - android:paddingRight="20dp"/> + android:layout_above="@id/tor_bootstrap_last_status_message" /> </RelativeLayout> diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index dce3dc1548c2..006d5c11f210 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3134,7 +3134,7 @@ public class BrowserApp extends GeckoApp // When the content loaded in the background (such as about:tor), // it was loaded while mBrowserChrome was GONE. We should refresh the // height now so the page is rendered correctly. - Tabs.getInstance().getSelectedTab().doReload(false); + Tabs.getInstance().getSelectedTab().doReload(true); // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false; diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java index 8d42b13a2a8e..2ee4c2528691 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java @@ -7,7 +7,6 @@ package org.mozilla.gecko.torbootstrap; import android.app.Activity; import android.content.Intent; -import android.graphics.drawable.Animatable2; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; @@ -16,6 +15,7 @@ import android.support.v4.content.LocalBroadcastManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -44,6 +44,8 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg protected Activity mActContext; protected TorBootstrapPager.TorBootstrapController mBootstrapController; + private ViewTreeLayoutListener mViewTreeLayoutListener; + // These are used by the background AlphaChanging thread for dynamically changing // the alpha value of the Onion during bootstrap. private int mOnionCurrentAlpha = 255; @@ -85,6 +87,155 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg } } + // Android tries scaling the image as a square. Create a modified ViewPort via padding + // top, left, right, and bottom such that the image aspect ratio is correct. + private void setOnionImgLayout() { + if (mRoot == null) { + Log.i(LOGTAG, "setOnionImgLayout: mRoot is null"); + return; + } + + ImageView onionImg = (ImageView) mRoot.findViewById(R.id.tor_bootstrap_onion); + if (onionImg == null) { + Log.i(LOGTAG, "setOnionImgLayout: onionImg is null"); + return; + } + + // Dimensions of the SVG. If the image is ever changed, update these values. The + // SVG viewport is 2dp wider due to clipping. + final double imgHeight = 289.; + final double imgWidth = 247.; + + // Dimensions of the current ImageView + final int currentHeight = onionImg.getHeight(); + final int currentWidth = onionImg.getWidth(); + + // If we only consider one dimension of the image, calculate the expected value + // of the other dimension (width vs. height). + final int expectedHeight = (int) (currentWidth*imgHeight/imgWidth); + final int expectedWidth = (int) (currentHeight*imgWidth/imgHeight); + + // Set current values as default. + int newWidth = currentWidth; + int newHeight = currentHeight; + + Log.d(LOGTAG, "Current Top=" + onionImg.getTop()); + Log.d(LOGTAG, "Current Height=" + currentHeight); + Log.d(LOGTAG, "Current Width=" + currentWidth); + Log.d(LOGTAG, "Expected height=" + expectedHeight); + Log.d(LOGTAG, "Expected width=" + expectedWidth); + + // Configure the width or height based on its expected value. This is based on + // the intuition that: + // - If the device is in portrait mode, then the device's height is (likely) + // greater than its width. When this is the case, then: + // - The image's View object is likely using all available vertical area + // (but the image is bounded by the width of the device due to + // maintaining the scaling factor). + // - However, the height and width of the graphic are equal (because + // Android enforces this). + // - The width should be less than the height (this is a property of + // the image itself). + // - The width should be proportional to the imgHeight and imgWidth + // defined above. + // Adjust the height when the current width is less than the expected width. + // The width is the limiting-factor, therefore choose the height proportional + // to the current width. + // + // - The opposite is likely true when the device is in landscape mode with + // respect to the height and width. Adjust the width when the height is less + // than the expected height. The height is the limiting-factor, therefore + // choose the width proportional to the current height. + // + // Subtract 1 from the expected value as a way of accounting for rounding + // error. + if (currentWidth < (expectedWidth - 1)) { + newHeight = expectedHeight; + } else if (currentHeight < (expectedHeight - 1)) { + newWidth = expectedWidth; + } + + Log.d(LOGTAG, "New height=" + newHeight); + Log.d(LOGTAG, "New width=" + newWidth); + + // Define the padding as the available space between the current height (as it + // is displayed to the user) and the new height (as it was calculated above). + int verticalPadding = currentHeight - newHeight; + int sidePadding = currentWidth - newWidth; + int leftPadding = 0; + int topPadding = 0; + int bottomPadding = 0; + int rightPadding = 0; + + // If the width of the image is greater than 600dp, then cap it at 702x600 (HxW). + // Furthermore, if the width is "near" 600dp (within 100dp), then decrease the + // dimensions to 468x400 dp. This should "look" better on lower-resolution + // devices. + final int MAXIMUM_WIDTH = 600; + final int distanceFromMaxWidth = newWidth - MAXIMUM_WIDTH; + final boolean isNearMaxWidth = Math.abs(distanceFromMaxWidth) < 100; + if ((newWidth > MAXIMUM_WIDTH) || isNearMaxWidth) { + if (isNearMaxWidth) { + // If newWidth is near MAX_WIDTH, then add additional padding (therefore + // decreasing the width by an additional 200dp). + sidePadding += 200; + } + + final int paddingSpaceAvailable = (distanceFromMaxWidth > 0) ? distanceFromMaxWidth : 0; + sidePadding += paddingSpaceAvailable; + + final int newWidthWithoutPadding = currentWidth - sidePadding; + + final int newHeightWithoutPadding = (int) (newWidthWithoutPadding*imgHeight/imgWidth); + + Log.d(LOGTAG, "New width without padding=" + newWidthWithoutPadding); + Log.d(LOGTAG, "New height without padding=" + newHeightWithoutPadding); + + verticalPadding = currentHeight - newHeightWithoutPadding; + } + + Log.d(LOGTAG, "New top padding=" + verticalPadding); + Log.d(LOGTAG, "New side padding=" + sidePadding); + + if (verticalPadding < 0) { + Log.i(LOGTAG, "vertical padding is " + verticalPadding); + verticalPadding = 0; + } else { + // Place 4/5 of padding at top, and 1/5 of padding at bottom. + topPadding = (int) (verticalPadding*4)/5; + bottomPadding = (int) verticalPadding/5; + } + + if (sidePadding < 0) { + Log.i(LOGTAG, "side padding is " + sidePadding); + leftPadding = 0; + rightPadding = 0; + } else { + // Divide the padding equally on the left and right side. + leftPadding = (int) sidePadding/2; + rightPadding = leftPadding; + } + + // Create a padding-box around the image and let Android fill the box with + // the image. Android will scale the width and height independently, so the + // end result should be a correctly-sized graphic. + onionImg.setPadding(leftPadding, topPadding, rightPadding, bottomPadding); + + // Separately scale x- and y-dimension. + onionImg.setScaleType(ImageView.ScaleType.FIT_XY); + + // Invalidate the view because the image disappears (is not redrawn) sometimes when + // the screen is rotated. + onionImg.invalidate(); + } + + private class ViewTreeLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener { + @Override + public void onGlobalLayout() { + TorBootstrapPanel.this.setOnionImgLayout(); + } + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) { mRoot = (ViewGroup) inflater.inflate(R.layout.tor_bootstrap, container, false); @@ -121,6 +272,12 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg TorLogEventListener.addLogger(this); + // Add a callback for notification when the layout is complete and all components + // are measured. Waiting until the layout is complete is necessary before we correctly + // set the size of the onion. Cache the listener so we may remove it later. + mViewTreeLayoutListener = new ViewTreeLayoutListener(); + mRoot.getViewTreeObserver().addOnGlobalLayoutListener(mViewTreeLayoutListener); + return mRoot; } @@ -193,6 +350,9 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg mOnionAlphaChangerRunning = false; } close(); + + // Remove the listener when we're done + mRoot.getViewTreeObserver().removeOnGlobalLayoutListener(mViewTreeLayoutListener); } } @@ -281,9 +441,9 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg Log.i(LOGTAG, "mChangeOnionAlphaThread.getState(): is terminated"); mChangeOnionAlphaThread = null; } else { - // Don't null the reference in this case because then we'll start another - // background thread. We are currently in an unknown state, simply set - // the Running flag as false. + // The reference is not nulled in this case because another + // background thread would start otherwise. The thread is currently in + // an unknown state, simply set the Running flag as false. Log.w(LOGTAG, "We're in an unexpected state. mChangeOnionAlphaThread.getState(): " + mChangeOnionAlphaThread.getState()); synchronized(mOnionAlphaChangerLock) { @@ -302,7 +462,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg // Synchronization across threads should not be necessary because there // shouldn't be any other threads relying on mOnionAlphaChangerRunning. - // We do this purely for safety. + // Do this purely for safety. synchronized(mOnionAlphaChangerLock) { mOnionAlphaChangerRunning = true; } @@ -317,7 +477,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg Log.w(LOGTAG, "startBootstrapping: mRoot is null?"); return; } - // We're starting bootstrap, transition into the bootstrapping-tor-panel + // Start bootstrap process and transition into the bootstrapping-tor-panel Button connectButton = mRoot.findViewById(R.id.tor_bootstrap_connect); if (connectButton == null) { Log.w(LOGTAG, "startBootstrapping: connectButton is null?"); @@ -326,17 +486,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg ImageView onionImg = (ImageView) mRoot.findViewById(R.id.tor_bootstrap_onion); - // Replace the current non-animated image with the animation - onionImg.setImageResource(R.drawable.tor_spinning_onion); - Drawable drawableOnion = onionImg.getDrawable(); - if (Build.VERSION.SDK_INT >= 23 && drawableOnion instanceof Animatable2) { - Animatable2 spinningOnion = (Animatable2) drawableOnion; - // Begin spinning - spinningOnion.start(); - } else { - Log.i(LOGTAG, "Animatable2 is not supported (or bad inheritance), version: " + Build.VERSION.SDK_INT); - } mOnionCurrentAlpha = 255; // The onion should have 100% alpha, begin decreasing it. @@ -388,27 +538,6 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg Drawable drawableOnion = onionImg.getDrawable(); - // If the connect button wasn't pressed previously, then this object is - // not an animation (it is most likely a BitmapDrawable). Only manipulate - // it when it is an Animatable2. - if (Build.VERSION.SDK_INT >= 23 && drawableOnion instanceof Animatable2) { - Animatable2 spinningOnion = (Animatable2) drawableOnion; - // spinningOnion is null if we didn't previously call startBootstrapping. - // If we reach here and spinningOnion is null, then there is likely a bug - // because stopBootstrapping() is called only when the user selects the - // gear button and we should only reach this block if the user pressed the - // connect button (thus creating and enabling the animation) and then - // pressing the gear button. Therefore, if the drawableOnion is an - // Animatable2, then spinningOnion should be non-null. - if (spinningOnion != null) { - spinningOnion.stop(); - - onionImg.setImageResource(R.drawable.tor_spinning_onion); - } - } else { - Log.i(LOGTAG, "Animatable2 is not supported (or bad inheritance), version: " + Build.VERSION.SDK_INT); - } - // Reset the onion's alpha value. onionImg.setImageAlpha(255); diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 9a8468292e7d..87ce1ec4bec6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -342,7 +342,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { Log.i(LOGTAG, "disableBridges: bridgesProvide is not null"); pref = bridgesProvide; } else { - Log.w(LOGTAG, "disableBridges: all the expected preferences are is null?"); + Log.w(LOGTAG, "disableBridges: all of the expected preferences are null?"); return; } @@ -396,7 +396,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { // such that it is synchronized with the widget. final SwitchPreference bridgesEnabled = (SwitchPreference) TorNetworkBridgesEnabledPreference.this.findPreference(PREFS_BRIDGES_ENABLED); if (bridgesEnabled == null) { - Log.w(LOGTAG, "onCreate: bridgesEnabled is null?"); + Log.w(LOGTAG, "onClick: bridgesEnabled is null?"); return; } @@ -422,11 +422,10 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setTitle(R.string.pref_tor_network_title); final SwitchPreference bridgesEnabled = (SwitchPreference) findPreference(PREFS_BRIDGES_ENABLED); if (bridgesEnabled == null) { - Log.w(LOGTAG, "onCreate: bridgesEnabled is null?"); + Log.w(LOGTAG, "onViewCreated: bridgesEnabled is null?"); return; } @@ -927,9 +926,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { } if (bridgesLine2 != null) { - // If bridgesLine1 was not null, then append a newline. Log.i(LOGTAG, "bridgesLine2 is not null."); if (bridgesLines != null) { + // If bridgesLine1 was not null, then append a newline. bridgesLines += "\n" + bridgesLine2; } else { bridgesLines = bridgesLine2; @@ -937,9 +936,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { } if (bridgesLine3 != null) { - // If bridgesLine1 was not null, then append a newline. Log.i(LOGTAG, "bridgesLine3 is not null."); if (bridgesLines != null) { + // If bridgesLine1 or bridgesLine2 were not null, then append a newline. bridgesLines += "\n" + bridgesLine3; } else { bridgesLines = bridgesLine3; @@ -954,11 +953,11 @@ public class TorPreferences extends AppCompatPreferenceActivity { } if (bridgesLines == null) { - Log.i(LOGTAG, "provideBridge is empty. Disabling."); // If provided bridges are null/empty, then only disable all bridges if // the user did not select a built-in bridge String configuredBuiltinBridges = getBridges(bridgesProvide.getSharedPreferences(), PREFS_BRIDGES_TYPE); if (configuredBuiltinBridges == null) { + Log.i(LOGTAG, "Custom bridges are empty. Disabling."); disableBridges(this); } return;

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 8b16afa5b647078a22a862360f4764bce82760ca Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 22 13:43:30 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29858 - Load onboarding panels after bootstrapping is completed. --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f8af42f09b5f..dce3dc1548c2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1363,10 +1363,10 @@ public class BrowserApp extends GeckoApp if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) { if (mTorNeedsStart) { showTorBootstrapPager(); + } else { + // We can't show the first run experience until Gecko has finished initialization (bug 1077583). + checkFirstrun(this, intent); } - - // We can't show the first run experience until Gecko has finished initialization (bug 1077583). - checkFirstrun(this, intent); } } @@ -3138,6 +3138,11 @@ public class BrowserApp extends GeckoApp // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false; + + // When bootstrapping completes, check if the Firstrun (onboarding) screens + // should be shown. + final SafeIntent intent = new SafeIntent(getIntent()); + checkFirstrun(BrowserApp.this, intent); } }); }

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit fd7cccb3f4a908ff38edfefc36b194666c886f69 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Apr 2 20:59:30 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29982 - Adding additional safe guards --- .../mozilla/gecko/torbootstrap/TorPreferences.java | 42 +++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 32a3bed3e685..9a8468292e7d 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -15,6 +15,7 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; +import android.support.v7.app.ActionBar; import android.text.style.ClickableSpan; import android.text.SpannableString; import android.text.Spanned; @@ -138,7 +139,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Save the current preference when the app is minimized or swiped away. @Override public void onStop() { - mFrag.onSaveState(); + if (mFrag != null) { + mFrag.onSaveState(); + } super.onStop(); } @@ -163,7 +166,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { // the back button @Override public void onBackPressed() { - mFrag.onSaveState(); + if (mFrag != null) { + mFrag.onSaveState(); + } super.onBackPressed(); } @@ -200,7 +205,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { // https://android.googlesource.com/platform/frameworks/base/+/6af15ebcfec64d0… @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { + if (item != null && item.getItemId() == android.R.id.home) { Log.i(LOGTAG, "onOptionsItemSelected(): Home"); onNavigateUp(); return true; @@ -214,8 +219,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected TorPreferences mTorPrefAct; @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); // This is only ever a TorPreferences mTorPrefAct = (TorPreferences) getActivity(); @@ -317,6 +322,11 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Disable the bridges.enabled Preference protected void disableBridges(PreferenceFragment frag) { + if (frag == null) { + Log.w(LOGTAG, "disableBridges: frag is null"); + return; + } + SwitchPreference bridgesEnabled = (SwitchPreference) frag.findPreference(PREFS_BRIDGES_ENABLED); Preference bridgesType = frag.findPreference(PREFS_BRIDGES_TYPE); Preference bridgesProvide = frag.findPreference(PREFS_BRIDGES_PROVIDE); @@ -349,7 +359,14 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Set the current title protected void setTitle(int resId) { - mTorPrefAct.getSupportActionBar().setTitle(resId); + ActionBar actionBar = mTorPrefAct.getSupportActionBar(); + + if (actionBar == null) { + Log.w(LOGTAG, "setTitle: actionBar is null"); + return; + } + + actionBar.setTitle(resId); } } @@ -446,6 +463,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { public void onChildViewAdded(View parent, View child) { Log.i(LOGTAG, "onChildViewAdded: Adding ListView child view"); + setTitle(R.string.pref_tor_network_title); + // Make sure the Switch widget is synchronized with the preference final Switch bridgesEnabledSwitch = (Switch) parent.findViewById(android.R.id.switch_widget); @@ -541,6 +560,11 @@ public class TorPreferences extends AppCompatPreferenceActivity { // If PREFS_BRIDGES_PROVIDE is not null, then true // Else false private boolean isBridgeProvided(SwitchPreference bridgesEnabled) { + if (bridgesEnabled == null) { + Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is null"); + return false; + } + if (!bridgesEnabled.isChecked()) { Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is not checked"); return false; @@ -572,7 +596,6 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setTitle(R.string.pref_tor_select_a_bridge_title); ListView lv = getListView(view); if (lv == null) { @@ -585,6 +608,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onChildViewAdded(View parent, View child) { + setTitle(R.string.pref_tor_select_a_bridge_title); + // Set the previously chosen RadioButton as checked final RadioGroup group = getBridgeTypeRadioGroup(); if (group == null) { @@ -828,7 +853,6 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setTitle(R.string.pref_tor_provide_a_bridge_title); ListView lv = getListView(view); if (lv == null) { Log.i(LOGTAG, "onViewCreated: ListView not found"); @@ -847,6 +871,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { lv.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() { @Override public void onChildViewAdded(View parent, View child) { + setTitle(R.string.pref_tor_provide_a_bridge_title); + // If we have a bridge line saved for this pref, // then show the user setBridgeProvideText(parent);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit d3ea3528ce2cde0675d297ea934090c77f4b5f76 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 1 21:39:53 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29906 Add API-level guard --- .../org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java index 584c0fc3cdde..8d42b13a2a8e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java @@ -106,11 +106,16 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg } }); - // This should be declared in the xml layout, however there is a bug - // preventing this (the XML attribute isn't actually defined in the - // SDK). - // https://issuetracker.google.com/issues/37036728 - connectButton.setClipToOutline(true); + if (Build.VERSION.SDK_INT > 20) { + // Round the button's edges, but only on API 21+. Earlier versions + // do not support this. + // + // This should be declared in the xml layout, however there is a bug + // preventing this (the XML attribute isn't actually defined in the + // SDK). + // https://issuetracker.google.com/issues/37036728 + connectButton.setClipToOutline(true); + } configureGearCogClickHandler();

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit d8163c5fe45122f4e7fa98b77e37a5736421edb9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 10 14:57:02 2019 -0400 fixup! Bug 29768: Introduce new features to users Fixes #30104. --- .../content/img/figure_tor-security-level.png | Bin 12185 -> 10888 bytes .../extensions/onboarding/content/onboarding.css | 6 ------ 2 files changed, 6 deletions(-) diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png index 5c7b8c5635fe..4f940ea008ef 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index ed7ef9e2add8..3bd1b4df7017 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -396,12 +396,6 @@ transform: scaleX(-1); } -/* The image contained in figure_tor-security-level.png contains English text; - * therefore it should not be flipped when the document direction is RTL. */ -#onboarding-tour-tor-security-update-8-5-page > .onboarding-tour-content > img:dir(rtl) { - transform: scaleX(1); -} - .onboarding-tour-content > iframe { width: 100%; height: 100%;

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit f29aef752c7bb1a6215bc537fff1d742ea0961fe Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 10 09:45:57 2019 -0400 fixup! Bug 29768: Introduce new features to users --- browser/extensions/onboarding/content/onboarding.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 939721677c4f..ed7ef9e2add8 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -27,6 +27,7 @@ padding: 16px 0 0 0; position: fixed; top: 4px; + offset-inline-start: 12px; } /* @@ -61,7 +62,6 @@ #onboarding-overlay-button { cursor: pointer; - offset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ background: none;

1 0

[tor-browser-build/master] Bug 30016: Localize bootstrap-/bridge-related strings for mobile
by boklm＠torproject.org 10 Apr '19

10 Apr '19

commit a901b95e48702cba67a5838244a5773a6843e5ba Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 7 06:30:08 2019 +0000 Bug 30016: Localize bootstrap-/bridge-related strings for mobile --- projects/firefox/build | 5 ++++- projects/firefox/config | 3 +++ projects/tba-translation/build | 8 ++++++++ projects/tba-translation/config | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 9bc025a..1d9faac 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -108,9 +108,10 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo # Move orbot files so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app - # Prepare building the multi-locale .apk + # Prepare building the multi-locale .apk including our own strings mkdir -p /var/tmp/dist/locales tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/tba-translation') %] [% END %] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) @@ -163,6 +164,8 @@ rm -f js/src/configure # Building a multi-locale .apk [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] + # Copy our torbrowser_strings.dtd at the right place + cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.dtd /var/tmp/dist/locales/[% lang %]/mobile/android/base/ ./mach build chrome-[% lang %]; [% END %] export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' diff --git a/projects/firefox/config b/projects/firefox/config index 679aaee..9eabf05 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -166,3 +166,6 @@ input_files: - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - project: tba-translation + name: tba-translation + enable: '[% c("var/android") %]' diff --git a/projects/tba-translation/build b/projects/tba-translation/build new file mode 100644 index 0000000..ac0f21b --- /dev/null +++ b/projects/tba-translation/build @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +tar xf [% project %]-[% c("version") %].tar.gz +mv [% project %]-[% c("version") %] [% project %] +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/tba-translation/config b/projects/tba-translation/config new file mode 100644 index 0000000..fd31b01 --- /dev/null +++ b/projects/tba-translation/config @@ -0,0 +1,7 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://git.torproject.org/translation.git +# We need to bump the commit before releasing but just pointing to a branch +# might cause too much rebuidling of the Firefox part. +git_hash: 8da59b784ec6a8492805379903696647adbcfb97 +version: '[% c("abbrev") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_30016_v2'
by boklm＠torproject.org 10 Apr '19

10 Apr '19

commit 516887a876b9ed5ebb020e8e3723fc09ac2fe3ec Merge: c141452 a901b95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 11 01:23:00 2019 +0200 Merge remote-tracking branch 'gk/bug_30016_v2' projects/firefox/build | 5 ++++- projects/firefox/config | 3 +++ projects/tba-translation/build | 8 ++++++++ projects/tba-translation/config | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30089_v4'
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit c14145264cd1f8eaff3a465d0014d5bf1d061e8a Merge: ed424fd 99b49ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 10 13:46:27 2019 +0000 Merge remote-tracking branch 'boklm/bug_30089_v4' projects/android-toolchain/build | 4 +--- projects/debootstrap-image/config | 8 -------- projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 6 +----- rbm.conf | 2 ++ 5 files changed, 5 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 30089: Use apksigner instead of jarsigner
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit 99b49adf8e049ff5d5c091485fb3a45b6e6e359c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 10 12:28:03 2019 +0200 Bug 30089: Use apksigner instead of jarsigner --- projects/android-toolchain/build | 4 +--- projects/debootstrap-image/config | 8 -------- projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 6 +----- rbm.conf | 2 ++ 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index ff899d2..9fe40f7 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -21,9 +21,7 @@ rm -fR android-ndk-r15c # The architectures we support archs="arm x86" for arch in $archs; do - # API 16 is the minimum we currently support for Tor Browser on Android for - # 32bit. - ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch + ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch done # Tool Archives diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 7d535ec..7fa3551 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -94,14 +94,6 @@ targets: suite: jessie arch: i386 - # Still needed to fix faketime issues in tor-browser for Android, see: #29453 - buster-amd64: - var: - minimal_apt_version: '1.8.0~alpha3.1' - container: - suite: buster - arch: amd64 - stretch-amd64: var: minimal_apt_version: 1.4.9 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 2de8d36..ffaf93d 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -25,4 +25,4 @@ zip -d $apk lib/armeabi/tor.so [% END %] # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android +java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 0a82092..c14b9d7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -52,11 +52,7 @@ targets: var: arch_deps: - openjdk-8-jdk - - faketime - # On some machines using faketime with Stretch to make the debug signature - # leads to a stalled build. Work around this by switching to Buster. - container: - suite: buster + - apksigner input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index 1a0c6ca..7be1106 100644 --- a/rbm.conf +++ b/rbm.conf @@ -191,6 +191,8 @@ targets: var: android: 1 compiler: android-toolchain + # API 16 is the minimum we currently support for Tor Browser on Android + android_min_api: 16 snowflake: 0 fteproxy: 0 container:

1 0

[tor-browser-build/master] Bug 30039: Use the target_prepend option in https-everywhere
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit ed424fd45a740f1b62857456fbcf616976012986 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 8 13:38:36 2019 +0200 Bug 30039: Use the target_prepend option in https-everywhere Update rbm for #30039, adding support for the target_prepend and target_append options in input_files. In projects/https-everywhere/config we now use the target_prepend option instead of the target option for the python input file. This does not change the output of the build. However this makes it possible in the future to check the channel or platform we build for in the python project (which was not possible before as we were using the target option, replacing all the initial targets). --- projects/https-everywhere/config | 2 +- rbm | 2 +- rbm.conf | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a9409cd..d84cdf6 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -32,5 +32,5 @@ input_files: - project: container-image - project: python name: python - target: + target_prepend: - common-stretch diff --git a/rbm b/rbm index 70d1ff3..87adfb7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a +Subproject commit 87adfb7b7be7e7e0f437020dbf8a119673133412 diff --git a/rbm.conf b/rbm.conf index 1a0c6ca..64192b4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: container: suite: stretch arch: amd64 + pre_pkginst: '' deps: - build-essential - python

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit 7706b044c9a013ae205168038ae8a734b2249741 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 9 14:38:35 2019 -0400 fixup! Bug 29768: Introduce new features to users --- .../extensions/onboarding/content/onboarding.css | 21 +++++++++---- .../extensions/onboarding/content/onboarding.js | 34 +++++++++++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 4804c4fbadc6..939721677c4f 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -341,14 +341,13 @@ grid-template-columns: [tour-page-start] 368px [tour-content-start] 1fr [tour-page-end]; } -.onboarding-tour-description-prefix { +.onboarding-tour-description-highlight { display: inline-block; - margin-bottom: -8px; /* reduce vertical space below */ - padding: 2px 10px; - vertical-align: center; + margin-inline-start: 8px; + padding: 6px 8px; + vertical-align: middle; background-color: #F1F1F3; border-radius: 4px; - min-height: 25px; font-size: 10px; font-weight: 600; text-transform: uppercase; @@ -373,6 +372,12 @@ color: #420c5d; } +.onboarding-tour-description-suffix { + margin-top: 6px; + font-size: 13px; + line-height: 16px; +} + .onboarding-tour-content { grid-row: tour-page-start / tour-button-start; grid-column: tour-content-start / tour-page-end; @@ -391,6 +396,12 @@ transform: scaleX(-1); } +/* The image contained in figure_tor-security-level.png contains English text; + * therefore it should not be flipped when the document direction is RTL. */ +#onboarding-tour-tor-security-update-8-5-page > .onboarding-tour-content > img:dir(rtl) { + transform: scaleX(1); +} + .onboarding-tour-content > iframe { width: 100%; height: 100%; diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index acfcd93c5cef..1326aebc9bcf 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -51,17 +51,6 @@ function createOnboardingTourDescription(div, title, description) { } /** - * Helper function to insert a prefix above the tour description. - */ -function addOnboardingTourPrefix(section, l10nId) { - let doc = section.ownerDocument; - let div = doc.createElement("div"); - div.className = "onboarding-tour-description-prefix"; - div.setAttribute("data-l10n-id", l10nId); - section.insertBefore(div, section.firstChild); // Insert as first child. -} - -/** * Helper function to create the tour content UI element. */ function createOnboardingTourContent(div, imageSrc) { @@ -189,11 +178,18 @@ var onboardingTourset = { "security": { id: "onboarding-tour-tor-security", tourNameId: "onboarding.tour-tor-security", + highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); - createOnboardingTourDescription(div, + let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); + let additionalDesc = win.document.createElement("p"); + additionalDesc.className = "onboarding-tour-description-suffix"; + additionalDesc.setAttribute("data-l10n-id", + "onboarding.tour-tor-security.description-suffix"); + desc.appendChild(additionalDesc); + createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); @@ -244,13 +240,13 @@ var onboardingTourset = { "toolbar-update-8.5": { id: "onboarding-tour-tor-toolbar-update-8-5", tourNameId: "onboarding.tour-tor-toolbar", + highlightId: "onboarding.tour-tor-update.prefix-updated", instantComplete: true, getPage(win) { let div = win.document.createElement("div"); let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-toolbar-update-8.5.title", "onboarding.tour-tor-toolbar-update-8.5.description"); - addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-updated"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-toolbar-layout.png"); createOnboardingTourButton(div, @@ -262,12 +258,12 @@ var onboardingTourset = { "security-update-8.5": { id: "onboarding-tour-tor-security-update-8-5", tourNameId: "onboarding.tour-tor-security", + highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-security-update-8.5.title", "onboarding.tour-tor-security-update-8.5.description"); - addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-new"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security-level.png"); let btnContainer = createOnboardingTourButton(div, @@ -1777,7 +1773,17 @@ class Onboarding { let tourPanelId = `${tour.id}-page`; tab.setAttribute("aria-controls", tourPanelId); + if (tour.highlightId) { + // Add [New] or [Updated] text after this navigation item to draw + // attention to it. + let highlight = this._window.document.createElement("span"); + highlight.className = "onboarding-tour-description-highlight"; + highlight.textContent = this._bundle.GetStringFromName(tour.highlightId); + tab.appendChild(highlight); + } + li.appendChild(tab); + itemsFrag.appendChild(li); // Dynamically create tour pages let div = tour.getPage(this._window, this._bundle);

1 0

[torbutton/master] Bug 29768: Introduce new features to users
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit de2b60ea51bf0c5e3be720c84ef1c121a00b4f1d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 9 14:25:04 2019 -0400 Bug 29768: Introduce new features to users Add an additional string for the onboarding tour that is displayed in new installations: a note about the possibility of adding NoScript and HTTPS Everywhere to the browser toolbar. --- src/chrome/locale/en-US/browserOnboarding.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index e2036832..e529a9b9 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -26,6 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. onboarding.tour-tor-security-level.button=See Your Security Level onboarding.tour-tor-security-level.next-button=Go to Experience Tips

1 0

[rbm/master] Bug 30039: Add the target_append and target_prepend input_files options
by gk＠torproject.org 09 Apr '19

09 Apr '19

commit 87adfb7b7be7e7e0f437020dbf8a119673133412 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 19:11:56 2019 +0200 Bug 30039: Add the target_append and target_prepend input_files options --- NEWS | 2 ++ doc/rbm_input_files.asc | 11 ++++++++++- lib/RBM.pm | 23 ++++++++++++++++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 256cad9..e54f988 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the target_append and target_prepend input_files options + - Add the build_log_append option - Add the rbm_tmp_dir option diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index 2716b23..d56f125 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -77,7 +77,16 @@ project:: target:: An array defining the build targets for the selected project. If this - option is not set, the current build target is forwarded. + option is not set, the current build target is forwarded. If set, + this replaces the current targets. + +target_append:: + The same as +target+, but instead of replacing the current targets, + the new targets are appended. + +target_prepend:: + The same as +target+, but instead of replacing the current targets, + the new targets are prepended. enable:: The files are enabled by default. If this option is set to diff --git a/lib/RBM.pm b/lib/RBM.pm index 1400700..4416a0c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -784,10 +784,27 @@ sub input_files { if ($input_file->{enable} && !$t->('enable')) { next; } - if ($input_file->{target}) { + if ($input_file->{target} || $input_file->{target_append} + || $input_file->{target_prepend}) { $input_file = { %$input_file }; - $input_file->{target} = process_template_opt($project, - $input_file->{target}, $options); + if (ref $input_file->{target} eq 'ARRAY') { + $input_file->{target} = process_template_opt($project, + $input_file->{target}, $options); + } else { + $input_file->{target} = $config->{run}{target}; + } + if (ref $input_file->{target_prepend} eq 'ARRAY') { + $input_file->{target} = [ @{ process_template_opt($project, + $input_file->{target_prepend}, + $options) }, + @{$input_file->{target}} ]; + } + if (ref $input_file->{target_append} eq 'ARRAY') { + $input_file->{target} = [ @{$input_file->{target}}, + @{ process_template_opt($project, + $input_file->{target_append}, + $options) } ]; + } } if ($action eq 'getfnames') { my $getfnames_name;

1 0

[torbutton/master] Bug 29943: Use locales in AB-CD scheme to match Mozilla
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit ad0f608cba44dc8be382b380b844cfd66dedecba Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 29 09:39:56 2019 +0000 Bug 29943: Use locales in AB-CD scheme to match Mozilla --- src/chrome.manifest | 8 ++++---- src/chrome/locale/{es => es-ES}/aboutDialog.dtd | 0 src/chrome/locale/{es => es-ES}/aboutTBUpdate.dtd | 2 +- src/chrome/locale/{es => es-ES}/aboutTor.dtd | 0 src/chrome/locale/{es => es-ES}/brand.dtd | 0 src/chrome/locale/{es => es-ES}/brand.properties | 0 .../locale/{es => es-ES}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{es => es-ES}/securityLevel.properties | 0 src/chrome/locale/{es => es-ES}/torbutton.dtd | 0 src/chrome/locale/{es => es-ES}/torbutton.properties | 0 src/chrome/locale/{ga => ga-IE}/aboutDialog.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTor.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.properties | 0 .../locale/{ga => ga-IE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{ga => ga-IE}/securityLevel.properties | 0 src/chrome/locale/{ga => ga-IE}/torbutton.dtd | 0 src/chrome/locale/{ga => ga-IE}/torbutton.properties | 0 src/chrome/locale/{nb => nb-NO}/aboutDialog.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTBUpdate.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTor.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.properties | 0 .../locale/{nb => nb-NO}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{nb => nb-NO}/securityLevel.properties | 0 src/chrome/locale/{nb => nb-NO}/torbutton.dtd | 0 src/chrome/locale/{nb => nb-NO}/torbutton.properties | 0 src/chrome/locale/{sv => sv-SE}/aboutDialog.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTor.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.properties | 0 .../locale/{sv => sv-SE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{sv => sv-SE}/securityLevel.properties | 0 src/chrome/locale/{sv => sv-SE}/torbutton.dtd | 0 src/chrome/locale/{sv => sv-SE}/torbutton.properties | 0 trans_tools/import-translations.sh | 14 ++++++-------- 38 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 87467217..2edacef0 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -46,7 +46,7 @@ locale torbutton dz chrome/locale/dz/ locale torbutton el chrome/locale/el/ locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ -locale torbutton es chrome/locale/es/ +locale torbutton es-ES chrome/locale/es-ES/ locale torbutton et chrome/locale/et/ locale torbutton eu chrome/locale/eu/ locale torbutton fa chrome/locale/fa/ @@ -56,7 +56,7 @@ locale torbutton fo chrome/locale/fo/ locale torbutton fr chrome/locale/fr/ locale torbutton fur chrome/locale/fur/ locale torbutton fy chrome/locale/fy/ -locale torbutton ga chrome/locale/ga/ +locale torbutton ga-IE chrome/locale/ga-IE/ locale torbutton gl chrome/locale/gl/ locale torbutton gu chrome/locale/gu/ locale torbutton gun chrome/locale/gun/ @@ -96,7 +96,7 @@ locale torbutton mt chrome/locale/mt/ locale torbutton my chrome/locale/my/ locale torbutton nah chrome/locale/nah/ locale torbutton nap chrome/locale/nap/ -locale torbutton nb chrome/locale/nb/ +locale torbutton nb-NO chrome/locale/nb-NO/ locale torbutton ne chrome/locale/ne/ locale torbutton nl chrome/locale/nl/ locale torbutton nn chrome/locale/nn/ @@ -121,7 +121,7 @@ locale torbutton sq chrome/locale/sq/ locale torbutton sr chrome/locale/sr/ locale torbutton st chrome/locale/st/ locale torbutton su chrome/locale/su/ -locale torbutton sv chrome/locale/sv/ +locale torbutton sv-SE chrome/locale/sv-SE/ locale torbutton sw chrome/locale/sw/ locale torbutton ta chrome/locale/ta/ locale torbutton te chrome/locale/te/ diff --git a/src/chrome/locale/es/aboutDialog.dtd b/src/chrome/locale/es-ES/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/es/aboutDialog.dtd rename to src/chrome/locale/es-ES/aboutDialog.dtd diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es-ES/aboutTBUpdate.dtd similarity index 88% rename from src/chrome/locale/es/aboutTBUpdate.dtd rename to src/chrome/locale/es-ES/aboutTBUpdate.dtd index 70b46fae..259b9496 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es-ES/aboutTBUpdate.dtd @@ -5,4 +5,4 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Versión"> <!ENTITY aboutTBUpdate.releaseDate "Fecha de lanzamiento"> -<!ENTITY aboutTBUpdate.releaseNotes "Notas de versiones"> +<!ENTITY aboutTBUpdate.releaseNotes "Notas de la versión"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es-ES/aboutTor.dtd similarity index 100% rename from src/chrome/locale/es/aboutTor.dtd rename to src/chrome/locale/es-ES/aboutTor.dtd diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es-ES/brand.dtd similarity index 100% rename from src/chrome/locale/es/brand.dtd rename to src/chrome/locale/es-ES/brand.dtd diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es-ES/brand.properties similarity index 100% rename from src/chrome/locale/es/brand.properties rename to src/chrome/locale/es-ES/brand.properties diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es-ES/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/es/browserOnboarding.properties rename to src/chrome/locale/es-ES/browserOnboarding.properties index ce7973aa..fbcc74e4 100644 --- a/src/chrome/locale/es/browserOnboarding.properties +++ b/src/chrome/locale/es-ES/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Bienvenido/a onboarding.tour-tor-welcome.title=Estás listo/a. onboarding.tour-tor-welcome.description=Tor Browser ofrece un alto standar de privacidad y seguridad mientras se navega por la red. Está ahora protegido de rastreadores, vigilancia y censura. Esta rápida introducción te enseñará cómo. -onboarding.tour-tor-welcome.button=Comienza Ahora +onboarding.tour-tor-welcome.next-button=Ir a la privacidad onboarding.tour-tor-privacy=Privacidad onboarding.tour-tor-privacy.title=Rastreadores y espías molestos @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Visualización del circuito onboarding.tour-tor-circuit-display.title=Ver tu recorrido onboarding.tour-tor-circuit-display.description=Por cada dominio que visitas, tus datos de tráfico son transportados y cifrados en un circuito a través de tres repetidores de Tor alrededor del mundo. Ningún sitio web sabe desde dónde te conectas. Puedes pedir un nuevo circuito haciendo clic en 'Nuevo Circuito para este Sitio' en la Visualización del Circuito. onboarding.tour-tor-circuit-display.button=Ver mi recorrido +onboarding.tour-tor-circuit-display.next-button=Ir a la Seguridad onboarding.tour-tor-security=Seguridad onboarding.tour-tor-security.title=Elige tu experiencia. onboarding.tour-tor-security.description=También te proporcionamos configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra Configuración de Seguridad te permite bloquear elementos que podrían usarse para atacar tu computadora. Haz clic a continuación para ver lo que hacen las diferentes opciones. onboarding.tour-tor-security-level.button=Mira tu nivel de seguridad +onboarding.tour-tor-security-level.next-button=Ir a los Consejos de Expertos onboarding.tour-tor-expect-differences=Consejos de expertos onboarding.tour-tor-expect-differences.title=Espera algunas diferencias. onboarding.tour-tor-expect-differences.description=Con todas las características de seguridad y privacidad proporcionadas por Tor, tu experiencia mientras navegas por Internet puede ser un poco diferente. Las cosas pueden ser un poco más lentas, y dependiendo de tu nivel de seguridad, algunos elementos pueden no funcionar o no cargarse. También se te puede pedir que demuestres que eres un ser humano y no un robot. onboarding.tour-tor-expect-differences.button=Preguntas frecuentes (FAQ) +onboarding.tour-tor-expect-differences.next-button=Ir a los Servicios de Cebolla onboarding.tour-tor-onion-services=Servicios cebolla onboarding.tour-tor-onion-services.title=Protégete bien. onboarding.tour-tor-onion-services.description=Los servicios cebolla son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente. Haz clic abajo para visitar el sitio cebolla de DuckDuckGo. onboarding.tour-tor-onion-services.button=Visita un sitio cebolla +onboarding.tour-tor-onion-services.next-button=Hecho # Circuit Display onboarding. onboarding.tor-circuit-display.next=Siguiente diff --git a/src/chrome/locale/es/securityLevel.properties b/src/chrome/locale/es-ES/securityLevel.properties similarity index 100% rename from src/chrome/locale/es/securityLevel.properties rename to src/chrome/locale/es-ES/securityLevel.properties diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es-ES/torbutton.dtd similarity index 100% rename from src/chrome/locale/es/torbutton.dtd rename to src/chrome/locale/es-ES/torbutton.dtd diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es-ES/torbutton.properties similarity index 100% rename from src/chrome/locale/es/torbutton.properties rename to src/chrome/locale/es-ES/torbutton.properties diff --git a/src/chrome/locale/ga/aboutDialog.dtd b/src/chrome/locale/ga-IE/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/ga/aboutDialog.dtd rename to src/chrome/locale/ga-IE/aboutDialog.dtd diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga-IE/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/ga/aboutTBUpdate.dtd rename to src/chrome/locale/ga-IE/aboutTBUpdate.dtd diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga-IE/aboutTor.dtd similarity index 100% rename from src/chrome/locale/ga/aboutTor.dtd rename to src/chrome/locale/ga-IE/aboutTor.dtd diff --git a/src/chrome/locale/ga/brand.dtd b/src/chrome/locale/ga-IE/brand.dtd similarity index 100% rename from src/chrome/locale/ga/brand.dtd rename to src/chrome/locale/ga-IE/brand.dtd diff --git a/src/chrome/locale/ga/brand.properties b/src/chrome/locale/ga-IE/brand.properties similarity index 100% rename from src/chrome/locale/ga/brand.properties rename to src/chrome/locale/ga-IE/brand.properties diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga-IE/browserOnboarding.properties similarity index 93% rename from src/chrome/locale/ga/browserOnboarding.properties rename to src/chrome/locale/ga-IE/browserOnboarding.properties index 8fe8d0cb..4f7a5030 100644 --- a/src/chrome/locale/ga/browserOnboarding.properties +++ b/src/chrome/locale/ga-IE/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Fáilte onboarding.tour-tor-welcome.title=Tá tú réidh. onboarding.tour-tor-welcome.description=Soláthraíonn Brabhsálaí Tor príobháideachas agus slándáil den chéad scoth ar an nGréasán. Cosnaíonn sé thú ar lorgaireacht, ar fhaire leictreonach, agus ar chinsireacht. Míneoidh an ceacht beag seo an chaoi a n-oibríonn sé. -onboarding.tour-tor-welcome.button=Tosaigh Anois +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Príobháideachas onboarding.tour-tor-privacy.title=Cuir bac ar na lorgairí agus ar na gliúcaigh. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Taispeántas an Chiorcaid onboarding.tour-tor-circuit-display.title=Do chosán a dhéanamh. onboarding.tour-tor-circuit-display.description=Ar gach fearann a dtugann tú cuairt air, cuirtear do chuid tráchta ar aghaidh trí chiorcad déanta as trí cinn d'athsheachadáin timpeall an domhain. Is féidir leat ciorcad nua a iarraidh trí ‘Ciorcadh Nua don Suíomh seo’ a chliceáil i dTaispeántas an Chiorcaid. onboarding.tour-tor-circuit-display.button=Mo Chosán +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Slándáil onboarding.tour-tor-security.title=D'eispéireas féin. onboarding.tour-tor-security.description=Soláthraímid socruithe breise duit lenar féidir leat leibhéal slándála níos airde a bhaint amach trí, mar shampla, cosc a chur ar eilimintí áirithe a d'fhéadfaí a úsáid chun ionsaí a dhéanamh ar do ríomhaire. Cliceáil thíos chun tuilleadh eolais a fháil faoi na roghanna éagsúla. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Leideanna onboarding.tour-tor-expect-differences.title=Bí ag súil le difríochtaí. onboarding.tour-tor-expect-differences.description=D'fhéadfadh d'eispéireas ar an Idirlíon a bheith pas beag difriúil mar gheall ar na gnéithe príobháideachais agus slándála i mbrabhsálaí Tor. B'fhéidir go mbeadh sé beagán níos moille, agus tá seans ann nach bhfeidhmeoidh nó nach lódálfaidh eilimintí áirithe, ag brath ar an leibhéal slándála. Uaireanta, iarrfar ort cruthúnas a thabhairt nach róbat thú. onboarding.tour-tor-expect-differences.button=Ceisteanna Coitianta +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Seirbhísí Onion onboarding.tour-tor-onion-services.title=Cosaint bhreise. onboarding.tour-tor-onion-services.description=Is éard atá i seirbhís onion ná suíomh speisialta ón fhearann barrleibhéil .onion a sholáthraíonn cosaintí breise d'fhoilsitheoirí agus do chuairteoirí, cosaintí ar an gcinsireacht san áireamh. Is féidir le haon duine seirbhísí onion a úsáid chun ábhar a fhoilsiú agus seirbhísí a sholáthar gan a ainm a nochtadh. Cliceáil thíos le cuairt a thabhairt ar an suíomh onion do DuckDuckGo. onboarding.tour-tor-onion-services.button=Oscail Oinniún +onboarding.tour-tor-onion-services.next-button=Déanta # Circuit Display onboarding. onboarding.tor-circuit-display.next=Ar Aghaidh diff --git a/src/chrome/locale/ga/securityLevel.properties b/src/chrome/locale/ga-IE/securityLevel.properties similarity index 100% rename from src/chrome/locale/ga/securityLevel.properties rename to src/chrome/locale/ga-IE/securityLevel.properties diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga-IE/torbutton.dtd similarity index 100% rename from src/chrome/locale/ga/torbutton.dtd rename to src/chrome/locale/ga-IE/torbutton.dtd diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga-IE/torbutton.properties similarity index 100% rename from src/chrome/locale/ga/torbutton.properties rename to src/chrome/locale/ga-IE/torbutton.properties diff --git a/src/chrome/locale/nb/aboutDialog.dtd b/src/chrome/locale/nb-NO/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/nb/aboutDialog.dtd rename to src/chrome/locale/nb-NO/aboutDialog.dtd diff --git a/src/chrome/locale/nb/aboutTBUpdate.dtd b/src/chrome/locale/nb-NO/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/nb/aboutTBUpdate.dtd rename to src/chrome/locale/nb-NO/aboutTBUpdate.dtd diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb-NO/aboutTor.dtd similarity index 100% rename from src/chrome/locale/nb/aboutTor.dtd rename to src/chrome/locale/nb-NO/aboutTor.dtd diff --git a/src/chrome/locale/nb/brand.dtd b/src/chrome/locale/nb-NO/brand.dtd similarity index 100% rename from src/chrome/locale/nb/brand.dtd rename to src/chrome/locale/nb-NO/brand.dtd diff --git a/src/chrome/locale/nb/brand.properties b/src/chrome/locale/nb-NO/brand.properties similarity index 100% rename from src/chrome/locale/nb/brand.properties rename to src/chrome/locale/nb-NO/brand.properties diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb-NO/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/nb/browserOnboarding.properties rename to src/chrome/locale/nb-NO/browserOnboarding.properties index 41fa07c1..2c0193fc 100644 --- a/src/chrome/locale/nb/browserOnboarding.properties +++ b/src/chrome/locale/nb-NO/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. -onboarding.tour-tor-welcome.button=Start nå +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din vei. onboarding.tour-tor-circuit-display.description=For hvert domene du besøker, blir trafikken din omdirigert og kryptert i en krets over tre Tor-reléer rundt om i verden. Ingen nettside vet hvor du kobler fra. Du kan be om en ny krets ved å klikke "Ny krets for dette nettstedet" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min Vei +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Sikkerhet onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=Vi gir deg også tilleggsinnstillinger for å støte på nettleserens sikkerhet. Våre sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til å angripe datamaskinen din. Klikk nedenfor for å se hva de forskjellige alternativene gjør. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Opplevelsestips onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. onboarding.tour-tor-expect-differences.button=se FAQs +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Løk-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. onboarding.tour-tor-onion-services.description=Onion tjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetskontroll mot sensur. Onion tjenester tillater alle å gi innhold og tjenester anonymt. Klikk nedenfor for å besøke DuckDuckGo-onionstedet. onboarding.tour-tor-onion-services.button=Besøk en Onion +onboarding.tour-tor-onion-services.next-button=Ferdig # Circuit Display onboarding. onboarding.tor-circuit-display.next=Neste diff --git a/src/chrome/locale/nb/securityLevel.properties b/src/chrome/locale/nb-NO/securityLevel.properties similarity index 100% rename from src/chrome/locale/nb/securityLevel.properties rename to src/chrome/locale/nb-NO/securityLevel.properties diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb-NO/torbutton.dtd similarity index 100% rename from src/chrome/locale/nb/torbutton.dtd rename to src/chrome/locale/nb-NO/torbutton.dtd diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb-NO/torbutton.properties similarity index 100% rename from src/chrome/locale/nb/torbutton.properties rename to src/chrome/locale/nb-NO/torbutton.properties diff --git a/src/chrome/locale/sv/aboutDialog.dtd b/src/chrome/locale/sv-SE/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/sv/aboutDialog.dtd rename to src/chrome/locale/sv-SE/aboutDialog.dtd diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv-SE/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/sv/aboutTBUpdate.dtd rename to src/chrome/locale/sv-SE/aboutTBUpdate.dtd diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv-SE/aboutTor.dtd similarity index 100% rename from src/chrome/locale/sv/aboutTor.dtd rename to src/chrome/locale/sv-SE/aboutTor.dtd diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv-SE/brand.dtd similarity index 100% rename from src/chrome/locale/sv/brand.dtd rename to src/chrome/locale/sv-SE/brand.dtd diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv-SE/brand.properties similarity index 100% rename from src/chrome/locale/sv/brand.properties rename to src/chrome/locale/sv-SE/brand.properties diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv-SE/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/sv/browserOnboarding.properties rename to src/chrome/locale/sv-SE/browserOnboarding.properties index 29406698..d603eaf6 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv-SE/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Välkommen onboarding.tour-tor-welcome.title=Du är redo. onboarding.tour-tor-welcome.description=Tor Browser erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. -onboarding.tour-tor-welcome.button=Börja nu +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Sekretess onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din väg. onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "ny krets för denna webbplats" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min väg +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Säkerhet onboarding.tour-tor-security.title=Välj din upplevelse. onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Erfarenhets tips onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå, vissa element kanske inte fungerar eller ladda. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. onboarding.tour-tor-expect-differences.button=Se Vanliga frågor +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Onion tjänster onboarding.tour-tor-onion-services.title=Var extra skyddad. onboarding.tour-tor-onion-services.description=Onion-tjänster är webbplatser som slutar med en .onion som ger extra skydd till utgivare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt. Klicka nedan för att besöka DuckDuckGo-onion webbplatsen. onboarding.tour-tor-onion-services.button=Besök en Onion +onboarding.tour-tor-onion-services.next-button=Färdig # Circuit Display onboarding. onboarding.tor-circuit-display.next=Nästa diff --git a/src/chrome/locale/sv/securityLevel.properties b/src/chrome/locale/sv-SE/securityLevel.properties similarity index 100% rename from src/chrome/locale/sv/securityLevel.properties rename to src/chrome/locale/sv-SE/securityLevel.properties diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv-SE/torbutton.dtd similarity index 100% rename from src/chrome/locale/sv/torbutton.dtd rename to src/chrome/locale/sv-SE/torbutton.dtd diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv-SE/torbutton.properties similarity index 100% rename from src/chrome/locale/sv/torbutton.properties rename to src/chrome/locale/sv-SE/torbutton.properties diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 5fbe4e7d..f14c353a 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,13 +2,12 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. -# This is not used for official builds, but should remain -# so Basque XPIs can be build independently. We can do -# this for other languages too, if anyone requests this -# and translations are available. +# This is not used for official builds, but should remain so Basque XPIs can be +# built independently. We can do that for other languages too, if anyone +# requests it and translations are available. # XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug # 26498. Others might want to fix, build, and use it, though. BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" @@ -76,10 +75,9 @@ for KEYVAL in "${FILEMAP[@]}"; do git merge -q origin/"$BRANCH" for i in $BUNDLE_LOCALES; do - UL="`echo $i|tr - _`" mkdir -p ../$LOCALE_DIR/$i/ # Some file names are lowercase in Transifex. - if [ -f $UL/"$DEST_FILE" ]; then + if [ -f $i/"$DEST_FILE" ]; then SRCFILE="$DEST_FILE" else SRCFILE="`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`" @@ -87,6 +85,6 @@ for KEYVAL in "${FILEMAP[@]}"; do # Use sed to work around a Transifex "double entity" issue. sed -e 's/\&brandShortName;/\&brandShortName;/g' \ -e 's/\&vendorShortName;/\&vendorShortName;/g' \ - $UL/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" + $i/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done

1 0

[torbutton/master] Merge branch 'bug_29943'
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit 76d056634148add263720504aa4c6ff0c480165a Merge: b10f69f1 ad0f608c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 8 16:12:46 2019 +0000 Merge branch 'bug_29943' src/chrome.manifest | 8 ++++---- src/chrome/locale/{es => es-ES}/aboutDialog.dtd | 0 src/chrome/locale/{es => es-ES}/aboutTBUpdate.dtd | 2 +- src/chrome/locale/{es => es-ES}/aboutTor.dtd | 0 src/chrome/locale/{es => es-ES}/brand.dtd | 0 src/chrome/locale/{es => es-ES}/brand.properties | 0 .../locale/{es => es-ES}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{es => es-ES}/securityLevel.properties | 0 src/chrome/locale/{es => es-ES}/torbutton.dtd | 0 src/chrome/locale/{es => es-ES}/torbutton.properties | 0 src/chrome/locale/{ga => ga-IE}/aboutDialog.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTor.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.properties | 0 .../locale/{ga => ga-IE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{ga => ga-IE}/securityLevel.properties | 0 src/chrome/locale/{ga => ga-IE}/torbutton.dtd | 0 src/chrome/locale/{ga => ga-IE}/torbutton.properties | 0 src/chrome/locale/{nb => nb-NO}/aboutDialog.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTBUpdate.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTor.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.properties | 0 .../locale/{nb => nb-NO}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{nb => nb-NO}/securityLevel.properties | 0 src/chrome/locale/{nb => nb-NO}/torbutton.dtd | 0 src/chrome/locale/{nb => nb-NO}/torbutton.properties | 0 src/chrome/locale/{sv => sv-SE}/aboutDialog.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTor.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.properties | 0 .../locale/{sv => sv-SE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{sv => sv-SE}/securityLevel.properties | 0 src/chrome/locale/{sv => sv-SE}/torbutton.dtd | 0 src/chrome/locale/{sv => sv-SE}/torbutton.properties | 0 trans_tools/import-translations.sh | 14 ++++++-------- 38 files changed, 35 insertions(+), 21 deletions(-) diff --cc src/chrome.manifest index 53587fba,2edacef0..f6a267d7 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@@ -46,8 -46,7 +46,8 @@@ locale torbutton dz chrome/locale/dz locale torbutton el chrome/locale/el/ locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ - locale torbutton es chrome/locale/es/ +locale torbutton es-AR chrome/locale/es-AR/ + locale torbutton es-ES chrome/locale/es-ES/ locale torbutton et chrome/locale/et/ locale torbutton eu chrome/locale/eu/ locale torbutton fa chrome/locale/fa/ diff --cc trans_tools/import-translations.sh index b8967287,f14c353a..c5724011 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@@ -2,15 -2,14 +2,14 @@@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync - BUNDLE_LOCALES="ar ca cs da de el es es-AR fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" -BUNDLE_LOCALES="ar ca cs da de el es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" ++BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. - # This is not used for official builds, but should remain - # so Basque XPIs can be build independently. We can do - # this for other languages too, if anyone requests this - # and translations are available. + # This is not used for official builds, but should remain so Basque XPIs can be + # built independently. We can do that for other languages too, if anyone + # requests it and translations are available. # XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug -# 26498. Others might want to fix, build, and use it, though. +# 26498 and #29257. Others might want to fix, build, and use it, though. BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" LOCALE_DIR=../src/chrome/locale

1 0