October 2019 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 840c3930d54b38f52a990a8514a4a2deaffb3247 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:08:26 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 9d744c6adc5e..05744bc48afd 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 9d744c6adc5ee3608e519c5db49528cd6ee6fe54 +Subproject commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61

1 0

[torbutton/master] Translations update
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:05:40 2019 +0000 Translations update --- chrome/locale/da/browserOnboarding.properties | 8 ++++---- chrome/locale/ja/browserOnboarding.properties | 10 +++++----- chrome/locale/ka/browserOnboarding.properties | 12 ++++++------ chrome/locale/mk/aboutTBUpdate.dtd | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/chrome/locale/da/browserOnboarding.properties b/chrome/locale/da/browserOnboarding.properties index 0b6f4ddc..a1113637 100644 --- a/chrome/locale/da/browserOnboarding.properties +++ b/chrome/locale/da/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillinger som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu findes i Præferencer. onboarding.tour-tor-network.action-button=Juster dine Tor-netværksindstillinger onboarding.tour-tor-network.button=Gå til kredsløb-visning @@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Opdateret onboarding.tour-tor-toolbar=Værktøjslinje onboarding.tour-tor-toolbar-update-9.0.title=Farvel Onion-knap. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=Forespørg en ny identitet +onboarding.tour-tor-toolbar-update-9.0.description=Vil ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge onion-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmod om en ny identitet med værktøjslinjeknappen eller [≡]-menuen. +onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-netværk # Circuit Display onboarding. diff --git a/chrome/locale/ja/browserOnboarding.properties b/chrome/locale/ja/browserOnboarding.properties index 1a3b8846..598b5960 100644 --- a/chrome/locale/ja/browserOnboarding.properties +++ b/chrome/locale/ja/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Tor ネットワークへ onboarding.tour-tor-network=Tor ネットワーク onboarding.tour-tor-network.title=分散型ネットワークを旅する。 onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。 -onboarding.tour-tor-network.description-para2=新規：Torネットワーク設定。環境設定に追加され、Torが検問されている地域でブリッジをリクエストすることができます。 -onboarding.tour-tor-network.action-button=Torネットワーク設定を設定する +onboarding.tour-tor-network.description-para2=NEW: Tor ネットワークの設定は、[設定] メニューの中に移動しました。Tor がブロックされる地域でブリッジを要求することなどができます。 +onboarding.tour-tor-network.action-button=Tor ネットワークの設定を調整 onboarding.tour-tor-network.button=サーキットディスプレイへ onboarding.tour-tor-circuit-display=サーキットディスプレイ @@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=新機能 onboarding.tour-tor-update.prefix-updated=更新 onboarding.tour-tor-toolbar=ツールバー -onboarding.tour-tor-toolbar-update-9.0.title= グッバイ、Onion Button。 -onboarding.tour-tor-toolbar-update-9.0.description=あなたのTorのすべてのデータをTor Browserに完全に移行したいと考えています。 -onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、今では、Onion buttonを使用せずに、URLバーの[ i ]をクリックしてTorサーキットを表示し、「このサイトに新しいサーキットを使用」をクリックするか、または[≡]メニューの「新しい識別子」をクリックして新しい識別子を要求することができます。 +onboarding.tour-tor-toolbar-update-9.0.title=さようなら、玉ねぎボタン。 +onboarding.tour-tor-toolbar-update-9.0.description=私たちは Tor の使用感を完全に Tor Browser に調和させたいと思っています。 +onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、玉ねぎボタンの代わりに、URL バーの [i] ボタンから Tor サーキットを確認したり、ツールバーボタンや [≡] メニューから新しい識別子をリクエストしたりできるようにしました。 onboarding.tour-tor-toolbar-update-9.0.button=新しい識別子をリクエストする方法 onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ネットワークへ diff --git a/chrome/locale/ka/browserOnboarding.properties b/chrome/locale/ka/browserOnboarding.properties index 11832796..5de57a60 100644 --- a/chrome/locale/ka/browserOnboarding.properties +++ b/chrome/locale/ka/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=იხილეთ Tor-ქსელი onboarding.tour-tor-network=Tor-ქსელი onboarding.tour-tor-network.title=ისარგებლეთ დამოუკიდებელი, ერთპიროვნული მმართველობისგან დაცული ქსელით. onboarding.tour-tor-network.description=Tor-ბრაუზერით უკავშირდებით Tor-ქსელს, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე, მთელი მსოფლიოს მასშტაბით. განსხვავებით VPN-ისგან, ამ შემთხვევაში არ გიწევთ ცალკეული პირის ან ერთეულის ნდობა და არავისზე ხართ დამოკიდებული, ინტერნეტით ვინაობის გაუმჟღავნებლად სარგებლობისას. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=სიახლე: Tor-ქსელის გამართვა, აგრეთვე, ხიდების მოთხოვნა, Tor-ის შეზღუდვის პირობებში, ახლა უკვე შეგიძლიათ პარამეტრებიდან. +onboarding.tour-tor-network.action-button=გამართეთ Tor-ქსელის პარამეტრები onboarding.tour-tor-network.button=იხილეთ წრედის არე onboarding.tour-tor-circuit-display=წრედის არე @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=ახალი onboarding.tour-tor-update.prefix-updated=განახლებული onboarding.tour-tor-toolbar=ხელსაწყოთა ზოლი -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=მშვიდობით Onion Button. +onboarding.tour-tor-toolbar-update-9.0.description=გვსურს, რომ Tor სრულად იყოს ჩაშენებული Tor-ბრაუზერში. +onboarding.tour-tor-toolbar-update-9.0.description-para2=სწორედ ამიტომ, ამიერიდან Tor-წრედს იხილავთ onion-ღილაკის ნაცვლად, [i] ნიშანზე დაწკაპებისას მისამართების ველში, ხოლო ახალი ვინაობის მოთხოვნა შეგეძლებათ ხელსაწყოთა ზოლიდან ან [≡] მენიუდან. +onboarding.tour-tor-toolbar-update-9.0.button=როგორ ხდება ახალი ვინაობის მოთხოვნა onboarding.tour-tor-toolbar-update-9.0.next-button=იხილეთ Tor-ქსელი # Circuit Display onboarding. diff --git a/chrome/locale/mk/aboutTBUpdate.dtd b/chrome/locale/mk/aboutTBUpdate.dtd index 9d8c386a..1649a138 100644 --- a/chrome/locale/mk/aboutTBUpdate.dtd +++ b/chrome/locale/mk/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени"> <!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран."> -<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,"> -<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна"> +<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, "> +<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Верзија"> <!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">

1 0

[torbutton/master] Bug 32125: Fix circuit display for bridge without a fingerprint
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 73df82bd36a812496067c8bef948df5130cb991b Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Oct 17 14:40:40 2019 -0700 Bug 32125: Fix circuit display for bridge without a fingerprint Torbutton expects all bridges to have a fingerprint when creating the browser's circuit display. This patch works around the case when the user provides a bridge without a fingerprint by assuming it is a bridge, but we cannot determine the other displayed info: type (obfs4, meek, etc) nor the ip. In this scenario, the entry node in the circuit display will simply say "Bridge". --- chrome/content/tor-circuit-display.js | 24 ++++++++++++++++-------- modules/tor-control-port.js | 3 +++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index f75bd781..21bcc57b 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -84,12 +84,19 @@ let nodeDataForID = async function (controller, id) { result.ip = bridge.address.split(":")[0]; } catch (e) { } } else { - result.type = "default"; - // Get the IP address for the given node ID. - try { - let statusMap = await controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; - } catch (e) { } + // either dealing with a relay, or a bridge whose fingerprint is not saved in torrc + try { + let statusMap = await controller.getInfo("ns/id/" + id); + result.type = "default"; + result.ip = statusMap.IP; + } catch (e) { + // getInfo will throw if the given id is not a relay + // this probably means we are dealing with a user-provided bridge with no fingerprint + result.type = "bridge"; + // we don't know the ip or type, so leave blank + result.ip = ""; + result.bridgeType = ""; + } } if (result.ip) { // Get the country code for the node's IP address. @@ -294,10 +301,11 @@ let updateCircuitDisplay = function () { let bridgeType = nodeData[i].bridgeType; if (bridgeType === "meek_lite") { relayText += ": meek"; - } else if (bridgeType !== "vanilla") { + } + else if (bridgeType !== "vanilla" && bridgeType !== "") { relayText += ": " + bridgeType; } - } else { + } else if (nodeData[i].type == "default") { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 6e310b52..9f6dbeb6 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -459,6 +459,9 @@ info.streamStatusParser = function (text) { "CircuitID", "Target"]); }; + +// TODO: fix this parsing logic to handle bridgeLine correctly +// fingerprint/id is an optional parameter // __info.bridgeParser(bridgeLine)__. // Takes a single line from a `getconf bridge` result and returns // a map containing the bridge's type, address, and ID.

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit f6b7218543a748a5f49c67dc397bb6348756a7a3 Author: Tom Ritter <tom(a)mozilla.com> Date: Thu Oct 3 21:02:16 2019 +0000 Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman Bug 1460357 disabled AVX because gcc was generating unaligned instructions. But clang doesn't seem to do that. Differential Revision: https://phabricator.services.mozilla.com/D48072 --HG-- extra : moz-landing-system : lando --- gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp index b04eaa91f8dc..d87ad1eb0503 100644 --- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp +++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp @@ -7,7 +7,7 @@ // As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce // unaligned instructions for this code, resulting in a crash. -#if defined(__AVX2__) && !defined(__MINGW32__) +#if defined(__AVX2__) #include <immintrin.h> #include <stdint.h>

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 26529 - Prompt before opening external app
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 6dc05e67cdbbb0a74f2c24387a3ea7443e08b57c Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sat Oct 12 00:45:36 2019 +0000 Bug 26529 - Prompt before opening external app --- .../base/java/org/mozilla/gecko/BrowserApp.java | 7 +++++-- .../android/base/java/org/mozilla/gecko/GeckoApp.java | 7 +++++-- .../base/java/org/mozilla/gecko/GeckoApplication.java | 7 +++++-- .../base/java/org/mozilla/gecko/IntentHelper.java | 15 +++++++++++---- .../java/org/mozilla/gecko/toolbar/BrowserToolbar.java | 1 + .../org/mozilla/gecko/toolbar/ToolbarEditLayout.java | 18 ++++++++++++++---- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5d6f725dc1c5..ab19b78d54e7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -175,6 +175,7 @@ import org.mozilla.gecko.util.WindowUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; import org.mozilla.gecko.widget.AnimatedProgressBar; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.DynamicToolbarAnimator; @@ -2237,7 +2238,8 @@ public class BrowserApp extends GeckoApp if (AppConstants.RELEASE_OR_BETA) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse("market://details?id=" + getPackageName())); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); break; } @@ -4195,7 +4197,8 @@ public class BrowserApp extends GeckoApp if (flags.contains(OnUrlOpenListener.Flags.OPEN_WITH_INTENT)) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(url)); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); } else { // By default this listener is used for lists where the offline reader-view icon // is shown - hence we need to redirect to the reader-view page by default. diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 1504470b697e..42edb2bfc99b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -43,6 +43,7 @@ import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.ViewUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoSessionSettings; import org.mozilla.geckoview.GeckoView; @@ -766,11 +767,13 @@ public abstract class GeckoApp extends GeckoActivity if (email != null) { Uri contactUri = Uri.parse(email); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else if (phone != null) { Uri contactUri = Uri.parse(phone); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else { // something went wrong. Log.e(LOGTAG, "Received Contact:Add message with no email nor phone number"); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index bb3cdec7c0fe..3801bb4d0b64 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -25,6 +25,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; import android.support.multidex.MultiDex; +import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.util.Base64; import android.util.Log; @@ -64,6 +65,7 @@ import org.mozilla.gecko.util.PRNGFixes; import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ShortcutUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoRuntime; import org.mozilla.geckoview.GeckoRuntimeSettings; @@ -813,8 +815,9 @@ public class GeckoApplication extends Application context.getContentResolver().delete(intent.getData(), null, null); } }; - ActivityHandlerHelper.startIntentForActivity(currentActivity, chooser, - handler); + ActivityHandlerHelper.registerActivityHandler(handler); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + currentActivity, ((AppCompatActivity)currentActivity).getSupportFragmentManager(), intent); } }); } diff --git a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java index c5b1666a31da..b5853a35ae20 100644 --- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java @@ -123,7 +123,7 @@ public final class IntentHelper implements BundleEventListener { String className, String action, String title, - final boolean showPromptInPrivateBrowsing) { + boolean showPromptInPrivateBrowsing) { final Context context = getContext(); final Intent intent = getOpenURIIntent(context, targetURI, mimeType, action, title); @@ -141,10 +141,15 @@ public final class IntentHelper implements BundleEventListener { } } + // Always prompt for Intents + showPromptInPrivateBrowsing = true; + final FragmentActivity activity = getActivity(); if (!showPromptInPrivateBrowsing || activity == null) { if (activity == null) { - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // We'll find out what this breaks. + return false; } return ActivityHandlerHelper.startIntentAndCatch(LOGTAG, context, intent); } else { @@ -152,7 +157,7 @@ public final class IntentHelper implements BundleEventListener { // statically, but since this method is called from Gecko and I'm // unfamiliar with that code, this is a simpler solution. return ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( - context, activity.getSupportFragmentManager(), intent); + activity, activity.getSupportFragmentManager(), intent); } } @@ -472,7 +477,9 @@ public final class IntentHelper implements BundleEventListener { // isn't owned exclusively by Firefox, so there's no real benefit to using content:// URIs // here. try (StrictModeContext unused = StrictModeContext.allowAllVmPolicies()) { - ActivityHandlerHelper.startIntentForActivity(activity, intent, handler); + // Always prompt. + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + activity, activity.getSupportFragmentManager(), intent); } catch (SecurityException e) { Log.w(LOGTAG, "Forbidden to launch activity.", e); } diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java index 2bc379cecb8b..3ba208ea0fcc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java @@ -222,6 +222,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout prefs = new ToolbarPrefs(); urlDisplayLayout.setToolbarPrefs(prefs); urlEditLayout.setToolbarPrefs(prefs); + urlEditLayout.setActivity(activity); // ScrollViews are allowed to have only one child. final View scrollChild = urlDisplayScroll.getChildAt(0); diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java index a28847285350..ecd8d49f5a41 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java @@ -9,6 +9,7 @@ import android.app.Activity; import android.content.Intent; import android.graphics.drawable.Drawable; import android.speech.RecognizerIntent; +import android.support.v7.app.AppCompatActivity; import android.widget.Button; import org.mozilla.gecko.ActivityHandlerHelper; import org.mozilla.gecko.GeckoAppShell; @@ -30,6 +31,7 @@ import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.InputOptionsUtils; import org.mozilla.gecko.util.StringUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.themed.ThemedImageButton; import org.mozilla.gecko.widget.themed.ThemedLinearLayout; @@ -60,6 +62,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { private final ThemedImageButton mVoiceInput; private final ThemedImageButton mQrCode; + private Activity mActivity; + private OnFocusChangeListener mFocusChangeListener; private boolean showKeyboardOnFocus = false; // Indicates if we need to show the keyboard after the app resumes @@ -185,6 +189,10 @@ public class ToolbarEditLayout extends ThemedLinearLayout { mQrCode.setPrivateMode(isPrivate); } + public void setActivity(Activity activity) { + mActivity = activity; + } + /** * Called when the parent gains focus (on app launch and resume) */ @@ -294,8 +302,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "voice_input_launch"); final Intent intent = InputOptionsUtils.createVoiceRecognizerIntent(getResources().getString(R.string.voicesearch_prompt)); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent data) { if (resultCode != Activity.RESULT_OK) { @@ -316,6 +323,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { imm.showSoftInput(mEditText, InputMethodManager.SHOW_IMPLICIT); } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } private boolean qrCodeIsEnabled(Context context) { @@ -331,8 +340,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "qrcode_input_launch"); final Intent intent = InputOptionsUtils.createQRCodeReaderIntent(); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent intent) { if (resultCode == Activity.RESULT_OK) { @@ -353,5 +361,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { // as well as the actual result, which may hold a URL. } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } }

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit 16981ced762c43a6646b0dcff8ee1955d0da57ea Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 19:22:31 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/contents+ca.po b/contents+ca.po index b97887fd2..9ae1230f2 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -254,6 +254,15 @@ msgid "" "advocate for privacy protections, and build important free, open source " "technologies that prioritize privacy." msgstr "" +"Els premis _Cy pres_ són fons distribuïts com a part de la liquidació de " +"plets d'acció de classe als Estats Units. Quan la totalitat dels fons no es " +"poden distribuir als membres de la classe, es poden distribuir a grups sense" +" ànim de lucre, advocació i grups de recerca que generalment representen els" +" membres de la classe. Els premis _cy pres_ de privadesa dels consumidors " +"poden ajudar el Tor Project a educar individus i organitzacions sobre com " +"mantenir la seva privadesa en línia, defensar les proteccions de privadesa i" +" crear importants tecnologies de codi obert gratuïtes que prioritzin la " +"privadesa." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -336,6 +345,13 @@ msgid "" "Defense Advanced Research Projects Agency (DARPA); and the Media Democracy " "Fund." msgstr "" +"En el passat, el Projecte Tor ha rebut els premis _cy pres_ de privadesa del" +" consumidor mitjançant les subvencions de la Fundació Rose sobre la " +"privadesa del consumidor. L’organització té més d’una dècada d’experiència " +"en la realització de projectes amb finançadors i socis tan variats com el " +"Departament d’Estat dels Estats Units – Oficina de Democràcia, Drets Humans " +"i Treball; la National Science Foundation; Agència de Projectes de Recerca " +"Avançada en Defensa (DARPA en anglès); i el Media Democracy Fund." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit fa6976587d520b4955c8533900e998d9a281ce20 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 18:52:25 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- fi/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd index f22c95d8c..fe9067e9f 100644 --- a/fi/network-settings.dtd +++ b/fi/network-settings.dtd @@ -69,13 +69,13 @@ Tässä saattaa kestää muutama minuutti."> <!ENTITY torPreferences.learnMore "Opi lisää"> <!ENTITY torPreferences.bridges "Sillat"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Käytä siltaa"> <!ENTITY torPreferences.requestNewBridge "Pyydä uusi silta..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Tarjoa silta"> <!ENTITY torPreferences.advanced "Lisätietoja"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.advancedDescription "Määritä kuinka Tor-selain yhdistää internetiin."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Pyydä siltaa"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytää sillan."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. Yritä uudelleen.">

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit c3a7d3182bdf5f9b79ba105bda74ab2eb94c1f1b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 18:49:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- fi/fi.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index 044c51a21..40d20cadd 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jiri Grönroos <jiri.gronroos(a)iki.fi>, 2019 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 # Marika M <inactive+Akiram(a)transifex.com>, 2013 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2019-10-07 08:43+0200\n" -"PO-Revision-Date: 2019-10-07 13:48+0000\n" -"Last-Translator: Mikko Ilmonen <mikko(a)5x.fi>\n" +"POT-Creation-Date: 2019-10-10 07:43+0200\n" +"PO-Revision-Date: 2019-10-19 18:27+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos(a)iki.fi>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -116,7 +117,7 @@ msgstr "Säilyttää tiedostot hakemistossa 'Persistent'" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Browser Bookmarks" -msgstr "" +msgstr "Selaimen kirjanmerkit" #: ../lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Bookmarks saved in the Tor Browser" @@ -136,7 +137,7 @@ msgstr "Lisäohjelmistot" #: ../lib/Tails/Persistence/Configuration/Presets.pm:102 msgid "Software installed when starting Tails" -msgstr "" +msgstr "Asennetut ohjelmistot Tailsin käynnistyessä" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Printers" @@ -148,11 +149,11 @@ msgstr "Tulostimien asetukset" #: ../lib/Tails/Persistence/Configuration/Presets.pm:135 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:137 msgid "Thunderbird emails, feeds, and settings" -msgstr "" +msgstr "Thunderbirdin sähköpostit, syötteet ja asetukset" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "GnuPG" @@ -267,11 +268,11 @@ msgstr "Pysyvän taltion oikeudet korjataan." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:343 msgid "Creating default persistence configuration." -msgstr "" +msgstr "Luodaan oletusarvoisia pysyväisasetuksia." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:346 msgid "The default persistence configuration will be created." -msgstr "" +msgstr "Oletusarvoiset pysyväisasetukset luodaan." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:361 msgid "Creating..."

1 0

[translation/tails-openpgp-applet_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet_completed
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit a8168e073a5331563505088836c01a20d4dd92de Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 18:49:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-apple… --- fi/openpgp-applet.pot | 85 ++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/fi/openpgp-applet.pot b/fi/openpgp-applet.pot index ea8afe480..08f5da1eb 100644 --- a/fi/openpgp-applet.pot +++ b/fi/openpgp-applet.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: +# Jiri Grönroos <jiri.gronroos(a)iki.fi>, 2019 # Propa G, 2016 # Thomas <lab777ee(a)hotmail.com>, 2016 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2019-01-15 12:27+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-10-19 18:31+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos(a)iki.fi>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,159 +22,159 @@ msgstr "" #: bin/openpgp-applet:160 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "Olet poistumassa OpenPGP sovelmasta. Oletko varma?" +msgstr "" #: bin/openpgp-applet:172 msgid "OpenPGP encryption applet" -msgstr "OpenPGP-salakirjoitussovelma" +msgstr "" #: bin/openpgp-applet:175 msgid "Exit" -msgstr "Lopeta" +msgstr "" #: bin/openpgp-applet:177 msgid "About" -msgstr "Tietoa" +msgstr "" #: bin/openpgp-applet:232 msgid "Encrypt Clipboard with _Passphrase" -msgstr "Salakirjoita leikepöytä _Salasanalla" +msgstr "" #: bin/openpgp-applet:235 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Allekirjoita/salakirjoita leikepöytä julkisilla _avaimilla" +msgstr "" #: bin/openpgp-applet:240 msgid "_Decrypt/Verify Clipboard" -msgstr "_Pura/todenna leikepöydän salaus" +msgstr "" #: bin/openpgp-applet:244 msgid "_Manage Keys" -msgstr "_Hallitse avaimia" +msgstr "" #: bin/openpgp-applet:248 msgid "_Open Text Editor" -msgstr "_Avaa tekstinmuokkain" +msgstr "" #: bin/openpgp-applet:292 msgid "The clipboard does not contain valid input data." -msgstr "Leikepöytä ei sisällä kelvollista syötetietoa." +msgstr "" #: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341 msgid "Unknown Trust" -msgstr "Tuntematon luotettavuus." +msgstr "" #: bin/openpgp-applet:343 msgid "Marginal Trust" -msgstr "Marginaalinen luottamus" +msgstr "" #: bin/openpgp-applet:345 msgid "Full Trust" -msgstr "Täysi luotettavuus." +msgstr "" #: bin/openpgp-applet:347 msgid "Ultimate Trust" -msgstr "Rajoittamaton luottamus" +msgstr "" #: bin/openpgp-applet:400 msgid "Name" -msgstr "Nimi" +msgstr "" #: bin/openpgp-applet:401 msgid "Key ID" -msgstr "Avaintunniste" +msgstr "" #: bin/openpgp-applet:402 msgid "Status" -msgstr "Tila" +msgstr "" #: bin/openpgp-applet:433 msgid "Fingerprint:" -msgstr "Sormenjälki:" +msgstr "" #: bin/openpgp-applet:436 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "Käyttäjätunnisteet:" -msgstr[1] "Käyttäjätunnisteet:" +msgstr[0] "" +msgstr[1] "" #: bin/openpgp-applet:465 msgid "None (Don't sign)" -msgstr "Ei mitään (älä allekirjoita)" +msgstr "" #: bin/openpgp-applet:528 msgid "Select recipients:" -msgstr "Valitse vastaanottajat:" +msgstr "" #: bin/openpgp-applet:536 msgid "Hide recipients" -msgstr "Piilota vastaanottajat" +msgstr "" #: bin/openpgp-applet:539 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Piilota salakirjoitetun viestin kaikkien vastaanottajien käyttäjätunnisteet. Muuten kaikki, jotka näkevät salakirjoitetun viestin, voivat nähdä ketkä ovat vastaanottajat." +msgstr "" #: bin/openpgp-applet:545 msgid "Sign message as:" -msgstr "Allekirjoita viesti nimellä:" +msgstr "" #: bin/openpgp-applet:549 msgid "Choose keys" -msgstr "Valitse avaimet" +msgstr "" #: bin/openpgp-applet:589 msgid "Do you trust these keys?" -msgstr "Luotatko näihin avaimiin?" +msgstr "" #: bin/openpgp-applet:592 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "Seuraava valittu avain ei ole kokonaan luotettu:" -msgstr[1] "Seuraavat valitut avaimet eivät ole kokonaan luotettuja:" +msgstr[0] "" +msgstr[1] "" #: bin/openpgp-applet:610 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "Luotatko tähän aivaimeen tarpeeksi käyttääksesi sitä joka tapauksessa?" -msgstr[1] "Luotatko näihin avaimiin tarpeeksi käyttääksesi niitä joka tapauksessa?" +msgstr[0] "" +msgstr[1] "" #: bin/openpgp-applet:623 msgid "No keys selected" -msgstr "Ei valittuja avaimia" +msgstr "" #: bin/openpgp-applet:625 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "Sinun on valittava yksityinen avain viestin allekirjoitukseen, tai jonkun julkisista avaimista viestin salakirjoittamiseen, tai molemmat." +msgstr "" #: bin/openpgp-applet:653 msgid "No keys available" -msgstr "Avaimia ei saatavilla" +msgstr "" #: bin/openpgp-applet:655 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "Tarvitset yksityisen avaimen viestin allekirjoitukseen tai julkisen avaimen viestin salakirjoittamiseen." +msgstr "" #: bin/openpgp-applet:783 msgid "GnuPG error" -msgstr "GnuPG-virhe" +msgstr "" #: bin/openpgp-applet:804 msgid "Therefore the operation cannot be performed." -msgstr "Tämän vuoksi tehtävää ei voida suorittaa." +msgstr "" #: bin/openpgp-applet:854 msgid "GnuPG results" -msgstr "GnuPG-tulokset" +msgstr "" #: bin/openpgp-applet:860 msgid "Output of GnuPG:" -msgstr "GnuPG-tuloste:" +msgstr "" #: bin/openpgp-applet:885 msgid "Other messages provided by GnuPG:" -msgstr "Muut GnuPG-viestit:" +msgstr ""

1 0

[translation/tails-openpgp-applet] https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit 6a71eaef4836a39d4b99aff46d661387e1680d5b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 18:49:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet --- fi/openpgp-applet.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fi/openpgp-applet.pot b/fi/openpgp-applet.pot index ea8afe480..d14b09d62 100644 --- a/fi/openpgp-applet.pot +++ b/fi/openpgp-applet.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: +# Jiri Grönroos <jiri.gronroos(a)iki.fi>, 2019 # Propa G, 2016 # Thomas <lab777ee(a)hotmail.com>, 2016 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2019-01-15 12:27+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-10-19 18:31+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos(a)iki.fi>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: bin/openpgp-applet:160 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "Olet poistumassa OpenPGP sovelmasta. Oletko varma?" +msgstr "Olet poistumassa OpenPGP-sovelmasta. Oletko varma?" #: bin/openpgp-applet:172 msgid "OpenPGP encryption applet" @@ -37,7 +38,7 @@ msgstr "Tietoa" #: bin/openpgp-applet:232 msgid "Encrypt Clipboard with _Passphrase" -msgstr "Salakirjoita leikepöytä _Salasanalla" +msgstr "Salaa leikepöytä _salasanalla" #: bin/openpgp-applet:235 msgid "Sign/Encrypt Clipboard with Public _Keys"

1 0