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

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

11 Oct '19

commit 2cc2e224b15c3edead9858573ca40a485513c9cf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 03:45:46 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 19c09e55c..0646b5224 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -7,14 +7,14 @@ # ef082130671b50894cb0f0340a268c8b, 2018 # erinm, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 -# ff98sha, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 # AngelFalse, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 +# ff98sha, 2019 # msgid "" msgstr "" -"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" +"Last-Translator: ff98sha, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -599,7 +599,7 @@ msgstr "捐款" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479 msgid "State/Province/Region" -msgstr "" +msgstr "州/省/地区" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483 msgid "Gift Selected" @@ -1939,12 +1939,14 @@ msgid "" "the growing threats to privacy, freedom of expression, and access to " "information online." msgstr "" +"“隐私冠军”：做出了 $ 1,000 " +"或更多的重大捐献承诺，能创建稳定、可靠的资金来源，以帮助我们灵活地防御对隐私日益增长的威胁，捍卫言论自由以及对在线信息访问的权利。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:87 msgid "" "As a Champion of Privacy, you'll receive exclusive gifts and invitations to " "online events that will give you insider access to what's happening at Tor." -msgstr "" +msgstr "作为“隐私冠军”，你将得到独家礼物，还能获得线上获得的邀请，让你可以内部人士的身份看看 Tor 的内部运作。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:91 msgid "" @@ -1956,7 +1958,7 @@ msgstr "我们相信世界上的每个人都应该能够享受我们工具提供 msgid "" "The Tor Project counts on the support of our Champions of Privacy to keep " "our software strong and available to everyone who needs it." -msgstr "" +msgstr "Tor 项目依靠我们的隐私捍卫者的支持来继续我们的使命，即提供保护人们在线隐私和身份的工具。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:95 msgid "With your help, we can make the Tor network accessible to all." @@ -1964,7 +1966,7 @@ msgstr "在您的帮助下，我们可以使所有人都能使用Tor网络。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:99 msgid "We're standing up for the universal human right to privacy." -msgstr "" +msgstr "我们的立场是，隐私是普世的人类权利。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:101 msgid "Join us by becoming a Champion of Privacy today."

1 0

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

11 Oct '19

commit 6498adc3f485247a9eee7bf034cd82a839feb03e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 03:45:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index b80ba10e5..0646b5224 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -7,14 +7,14 @@ # ef082130671b50894cb0f0340a268c8b, 2018 # erinm, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 -# ff98sha, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 # AngelFalse, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 +# ff98sha, 2019 # msgid "" msgstr "" -"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" +"Last-Translator: ff98sha, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -599,7 +599,7 @@ msgstr "捐款" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479 msgid "State/Province/Region" -msgstr "国家/省/地区" +msgstr "州/省/地区" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483 msgid "Gift Selected" @@ -1946,7 +1946,7 @@ msgstr "" msgid "" "As a Champion of Privacy, you'll receive exclusive gifts and invitations to " "online events that will give you insider access to what's happening at Tor." -msgstr "作为“隐私冠军”，你将得到独家礼物，还能获得线上获得的邀请，让你可以内部人士的身份看看 Tor 里面的。" +msgstr "作为“隐私冠军”，你将得到独家礼物，还能获得线上获得的邀请，让你可以内部人士的身份看看 Tor 的内部运作。" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:91 msgid ""

1 0

[tor-browser-spec/master] Update notes based on GeKo's comments.
by mikeperry＠torproject.org 11 Oct '19

11 Oct '19

commit d25eeb661b9d4975a1a7868f07d333b5332d39dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 19:13:10 2019 -0500 Update notes based on GeKo's comments. --- audits/FF68_NETWORK_AUDIT | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/audits/FF68_NETWORK_AUDIT b/audits/FF68_NETWORK_AUDIT index f8965cb..93b0c9a 100644 --- a/audits/FF68_NETWORK_AUDIT +++ b/audits/FF68_NETWORK_AUDIT @@ -155,8 +155,9 @@ _SOCKET + Looks benign and also not new UDPSocket - - XXX: devtools debugger discovery still uses it + - devtools debugger discovery still uses it - ./devtools/shared/discovery/discovery.js + + Disabled via pref in #18546 + webrtc moved code + dom.udpsocket.enabled still false - fallback multicastDNS uses it (not new) @@ -167,14 +168,15 @@ TCPSocket SocketTransport + IOactivityMonitor, NetworkActivityMonitor? (old) - - XXX: presentation control service? I think this is old but moved + - presentation control service? I think this is old but moved - dom/presentation/PresentationTCPSessionTransport.cpp - - App to app service.. + + Patched - Dashboard - netwerk/base/Dashboard.cpp + Only examine opened sockets and cached DNS - - XXX: Roku control (old) + - Roku control (old) - ./toolkit/modules/secondscreen/RokuApp.jsm + + patched - NetworkConnectivityService?? This looks new - ./netwerk/base/NetworkConnectivityService.cpp + Uses DNS service and nsIChannels.. Proxy safe @@ -228,7 +230,7 @@ Android Java calls + ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + BaseResource.java (is this proxied? Who calls this?) + Lots of consumers.. - - XXX: Patch going back in: https://bugs.torproject.org/31934 + + Patch going back in: https://bugs.torproject.org/31934 + leanplum (disabled) + Adjust SDK uses execute directly + https://bugs.torproject.org/25906 disabled

1 0

[tor-browser-spec/master] Add Firefox 68 network audit notes
by mikeperry＠torproject.org 11 Oct '19

11 Oct '19

commit 8edeebec646e37161b78fabda6ab51f794df7fdb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 19:02:02 2019 -0500 Add Firefox 68 network audit notes --- audits/FF68_NETWORK_AUDIT | 311 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 311 insertions(+) diff --git a/audits/FF68_NETWORK_AUDIT b/audits/FF68_NETWORK_AUDIT new file mode 100644 index 0000000..f8965cb --- /dev/null +++ b/audits/FF68_NETWORK_AUDIT @@ -0,0 +1,311 @@ +Things to grep for in general when investigating changes: + +=============== Native DNS Portion ============= + +PR_GetHostByName +PR_GetIPNodeByName +PR_GetAddrInfoByName +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + +MDNS +TRR (DNS Trusted Recursive Resolver) + +Direct Paths to DNS resolution: +nsDNSService::Resolve +nsDNSService::AsyncResolve +nsHostResolver::ResolveHost + +============ Misc Socket Portion ============== + +SOCK_ +SOCKET_ +_SOCKET +UDPSocket +TCPSocket + PR_NewTCPSocket + AsyncTCPSocket + +Misc PR_Socket + +=========== Misc XPCOM Portion ================ + +Misc XPCOM (including commands for pre-diff review approach) + *SocketProvider + grep -R udp-socket . + grep -R tcp-socket . + grep for tcpsocket + grep -R "NS_" | grep SOCKET | grep "_C" + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + +============ Rust Portion ================ + +Rust + - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool? + - Check for new sendmsg and recvmsg usage + +============ Android Portion ============= + +Android Java calls + - URLConnection + - XXX: getInputStream? other methods? + - HttpURLConnection + - UrlConnectionDownloader + - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + - grep -n openConnection\( mobile/android/thirdparty/ + - java.net + - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/ + - javax.net + - ch.boye.httpclientandroidlib.conn.* (esp ssl) + - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + - Sudden appearance of thirdparty libs: + - OkHttp + - Retrofit + - Glide + - com.amitshekhar.android + - IntentHelper + - openUriExternal (can come from GeckoAppShell too) + - getHandlersForMimeType + - getHandlersForURL + - getHandlersForIntent + - android.content.Intent - too common; instead find launch methods: + - startActivity + - startActivities + - sendBroadcast + - sendOrderedBroadcast + - startService + - bindService + - android.app.PendingIntent + - android.app.DownloadManager + - ActivityHandlerHelper.startIntentAndCatch + + + +============ Regression/Prior Vuln Review ========= + +Review proxy bypass bugs; check for new vectors to look for: + - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy + +------------------------------------------------------------------------------- +I followed the diff approach by doing `git diff esr60 esr68` and then +going over all the changes containing the above mentioned potentially dangerous +calls and features. + +Direct Paths to DNS resolution: + + PR_GetHostByName + + No new cals in diff +PR_GetIPNodeByName + + No new calls in diff +PR_GetAddrInfoByName + + Edited calls in diff, but no change +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + + One change in NSS unit tests ("127.0.0.1" to higher level call) + +MDNS: + + No substantive changes + +nsDNSService: + - nsDNSServiceDiscovery appears to support fallback JS mDNS option + + nsDNSServiceDiscovery itself is not new.. + + nsDNSService has an mProxyType now + - nsDNSService::AsyncResolveInternal()? + + Patch blocks this (XXX: Maybe should move to PreprocessHostName) + + nsDNSAsyncRequest + - nHostResolver::ResolveHost + + not used outside dnsservice + + nsDNSService::ResolveInternal() + + ResolveHost() with type now... + + Patched + + AsyncResolve, AsyncResolveNative, AsyncResolveByType + + AsyncResolveInternal() + + Patched + + Resolve() + + ResolveNative + + ResolveInternal() + + Patched + + What about our dns service patch? where did that go? + + https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-68.1.0e… + + https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-60.8.0e… +nsHostResolver: + + Only used by DNS service + + +SOCK_ + + libvpx has unit tests that use sockets + + many changes due to moved webrtc code.. + + All disabled and not compiled in + + Lots of python unittests + + Sctp code has sockets.. Is this used? + + by webrtc, which we disable + - rust/cloudabi has some... + + recordreplay has some but they are AF_UNIX + +SOCKET_ + + Again, lots due to moved WebRTC code + + Some android sockets in "LeanPlum" android lib + + leanplum is disabled + + Curl is in the tree now? lol + + Some sandboxing constants + +_SOCKET + - media/audioipc in rust? + - mio in rust? + + is media/mtransport/nr_socket_prsock.cpp off with webrtc? + + looks like yes + - IOActivityMonitor? + + Looks benign and also not new + +UDPSocket + - XXX: devtools debugger discovery still uses it + - ./devtools/shared/discovery/discovery.js + + webrtc moved code + + dom.udpsocket.enabled still false + - fallback multicastDNS uses it (not new) +TCPSocket + + devtools adbsocket uses, but to localhost + + mtransport uses, but disabled for webrtc + + Tests use + +SocketTransport + + IOactivityMonitor, NetworkActivityMonitor? (old) + - XXX: presentation control service? I think this is old but moved + - dom/presentation/PresentationTCPSessionTransport.cpp + - App to app service.. + - Dashboard + - netwerk/base/Dashboard.cpp + + Only examine opened sockets and cached DNS + - XXX: Roku control (old) + - ./toolkit/modules/secondscreen/RokuApp.jsm + - NetworkConnectivityService?? This looks new + - ./netwerk/base/NetworkConnectivityService.cpp + + Uses DNS service and nsIChannels.. Proxy safe + - TCPFastOpen (old, but flagged before) + - ./netwerk/base/TCPFastOpenLayer.cpp + - AttachTCPFastOpenIOLayer + + Appears to attach to nsSocketTransport such that it would only fast + open to the socks port.. + - TCPFastOpenConnect + + Only used via nsSocketTransport + +Extra: + PR_Socket() + + None + PR_Connect()? + + Minor changes + + +Misc XPCOM (including commands for pre-diff review approach) + + *SocketProvider + + Only minor changes + grep -R udp-socket . + + minor changes + grep -R tcp-socket . + + docstring only + grep for tcpsocket + + adb uses for 127.0.0.1 connection + + webrtc + grep -R "NS_" | grep SOCKET | grep "_C" + + indent and thread check changes; removed code + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + + minor changes to spdy and unittests + +Rust + + Check for new sendmsg and recvmsg usage + - XXX: only in mio, audioipc.. + - XXX: ask tjr to re-run tool? + +Android Java calls + - URLConnection (and HttpURLConnection) + + updater code moved; still looks ok + + BitmapConnection extends in mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java + + Some DRM thing + + Crashreporter + + leanplum (disabled) + + DefaultHttpDataSource (used only by exoplayer/HLS, which is disabled) + + tests + + grep -n openConnection\( mobile/android/thirdparty/ + + leanplum (disabled) + + UrlConnectionDownloader in mobile/android/thirdparty/com/squareup/picasso/ + + ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + + BaseResource.java (is this proxied? Who calls this?) + + Lots of consumers.. + - XXX: Patch going back in: https://bugs.torproject.org/31934 + + leanplum (disabled) + + Adjust SDK uses execute directly + + https://bugs.torproject.org/25906 disabled + + java.net + + mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/UdpDataSource.java + + Not used anywhere + + also: https://gitweb.torproject.org/tor-browser.git/commit/mobile/android/geckovi… + + also https://gitweb.torproject.org/tor-browser.git/commit/mobile/android/moz.con… + - java.net.URL + - XXX: GeckoApplication.downloadImageForSetImage uses URL.openStream() + - XXX: GeckoActionProvider.downloadImageForIntent uses java.net.URL.openStream() + - XXX: GeckAppShell has many wrappers to create inputstreams from URLConnections + - Do these always have to be opened/connected first? + - XXX: GeckoMediaDrmBridgeV21.java - uses android.media.MediaDrm which seems to fetch stuff?? + - XXX: BitmapUtils.decodeUrl uses openStream for non-jar urls + - XXX: GeckoJarReader - tons of use.. Can this be used on remote jars? + - XXX: AbstractCommunicator.openConnectionAndSetHeaders() - uses url.openConnection() + - XXX: AbstractCommunicator.sendData() - uses url.getOutputStream().. maybe ok? + + javax.net + + TLSSocketFactory from sync + + not used + + ch.boye.httpclientandroidlib.conn.* (esp ssl) + + Not used + + ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + + Not used + - IntentHelper + + openUriExternal prompts if private browsing mode enabled + - XXX: Do we enable this? Can users turn it off? + - XXX: ./mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java + - Uses intents to direct fetch URL + - XXX: Sets "show in private browsing mode" prompt to false + - XXX: ./mobile/android/base/java/org/mozilla/gecko/BrowserApp.java + - Also does telemetry via IntentHelper.openURIExternal + - XXX: Delegates to BrowserAppDelegate list in onNewIntent()... What's in this + list? + - XXX: ./mobile/android/base/java/org/mozilla/gecko/ChromeCastDisplay.java + - XXX: Looks like it might launch external service? + - XXX: ./mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java + - getHandlersFor* + - HelperApps.jsm + + browser.js uses prompt + + HelperAppDialog.js + - android.content.Intent? OMG everywhere :( + - startActivity + - XXX: ActivityHandlerHelper - Good candidate to patch for external + activities + - XXX: BrowserApp.onUrlOpenWithRefferer - Might be able to launch other + apps if OPEN_WITH_INTENT flag is set? + - XXX: CustomTabsActivity.java - Several methods + - XXX: WebAppActivity.onLoadRequest + - XXX: BasicGeckoViewPrompt.onFilePrompt() + - XXX: GeckoViewActivity.onExternalResponse() + + startActivities + + not used + + sendBroadcast + + Some wifi scanning/GPS stuff but is local broadcast.. + + sendOrderedBroadcast + + not used + + startService + + all use seems targeted to sub-components + - bindService + - XXX: SurfaceAllocator - no idea what is happening here :/ + - XXX: RemoteManager - no idea what is happening here :/ +- android.app.PendingIntent + - XXX: ChromeCastDisplay.java - probably want to make sure this is disabled? + - It uses RemotePresentationService + - XXX: CustomTabsActivity.performPendingIntent - again, hard to tell what is + happening here :/ +- android.app.DownloadManager + - XXX: BrowserApp.java uses it + - XXX: DownloadsIntegration.java uses it, but has a check for useSystemDownloadManager() ++ ActivityHandlerHelper.startIntentAndCatch + + Used only by other wrappers already covered + + + +TRR: + - assuming disabled by pref; deferring audit + +

1 0

[tor-browser-spec/master] Add a sketch for how we've done the network audits so far.
by mikeperry＠torproject.org 11 Oct '19

11 Oct '19

commit caf16ac6759033b770b557c606fff09c5b7d9bf2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 19:01:25 2019 -0500 Add a sketch for how we've done the network audits so far. --- audits/NETWORK_AUDIT_RUBRIC | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/audits/NETWORK_AUDIT_RUBRIC b/audits/NETWORK_AUDIT_RUBRIC new file mode 100644 index 0000000..89ec61c --- /dev/null +++ b/audits/NETWORK_AUDIT_RUBRIC @@ -0,0 +1,88 @@ +`git diff esrA esrB` and then go over all the changes containing the +above mentioned potentially dangerous calls and features. Grep the diff for +the following strings and examine surrounding usage. + +=============== Native DNS Portion ============= + +PR_GetHostByName +PR_GetIPNodeByName +PR_GetAddrInfoByName +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + +MDNS +TRR (DNS Trusted Recursive Resolver) + +Direct Paths to DNS resolution: +nsDNSService::Resolve +nsDNSService::AsyncResolve +nsHostResolver::ResolveHost + +============ Misc Socket Portion ============== + +SOCK_ +SOCKET_ +_SOCKET +UDPSocket +TCPSocket + PR_NewTCPSocket + AsyncTCPSocket + +Misc PR_Socket + +=========== Misc XPCOM Portion ================ + +Misc XPCOM (including commands for pre-diff review approach) + *SocketProvider + grep -R udp-socket . + grep -R tcp-socket . + grep for tcpsocket + grep -R "NS_" | grep SOCKET | grep "_C" + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + +============ Rust Portion ================ + +Rust + - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool? + - Check for new sendmsg and recvmsg usage + +============ Android Portion ============= + +Android Java calls + - URLConnection + - XXX: getInputStream? other methods? + - HttpURLConnection + - UrlConnectionDownloader + - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + - grep -n openConnection\( mobile/android/thirdparty/ + - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/ + - java.net + - javax.net + - ch.boye.httpclientandroidlib.conn.* (esp ssl) + - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + - Sudden appearance of thirdparty libs: + - OkHttp + - Retrofit + - Glide + - com.amitshekhar.android + - IntentHelper + - openUriExternal (can come from GeckoAppShell too) + - getHandlersForMimeType + - getHandlersForURL + - getHandlersForIntent + - android.content.Intent - too common; instead find launch methods: + - startActivity + - startActivities + - sendBroadcast + - sendOrderedBroadcast + - startService + - bindService + - android.app.PendingIntent + - android.app.DownloadManager + - ActivityHandlerHelper.startIntentAndCatch + +============ Regression/Prior Vuln Review ========= + +Review proxy bypass bugs; check for new vectors to look for: + - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy + - Look for new features like these. Especially external app launch vectors +

1 0

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

10 Oct '19

commit 02f8f808d8e87c60fcc099cc4b0428f72b303f7e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 10 23:48:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index 94d05f381..77acfad01 100644 --- a/fi.po +++ b/fi.po @@ -10,7 +10,7 @@ # Pietu1998 <smiley(a)pietu1998.net>, 2016 # Streets of Oulu <banchie443(a)gmail.com>, 2017 # Thomas <lab777ee(a)hotmail.com>, 2015-2016 -# Tomi Toivio <tomi(a)sange.fi>, 2013 +# Tomi Toivio <tomi.toivio(a)ukuli.fi>, 2013 # tonttula, 2013 # Finland355 <ville.ehrukainen2(a)gmail.com>, 2014 msgid ""

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to latest code
by gk＠torproject.org 10 Oct '19

10 Oct '19

commit 3e10c70290f8a292f074ca767610ff52af695715 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 10 20:56:19 2019 +0000 Update Torbutton to latest code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 3509fb9c4e9d..e54639aab0c6 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 3509fb9c4e9db216066a0d102f37d9e3d1434ef0 +Subproject commit e54639aab0c60274c14809cd9129b534bb79f92c

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31768: Introduce toolbar and network settings changes in onboarding
by gk＠torproject.org 10 Oct '19

10 Oct '19

commit 6126f44deb98e91efb4fb6a13dd7eb4c2c46d8e1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 9 16:54:54 2019 -0400 Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. --- browser/app/profile/000-tor-browser.js | 6 +- browser/components/uitour/UITour.jsm | 7 +++ browser/extensions/onboarding/api.js | 5 +- .../extensions/onboarding/content/Onboarding.jsm | 70 +++++++++++---------- .../onboarding/content/img/figure_tor-network.png | Bin 27931 -> 11982 bytes .../content/img/figure_tor-toolbar-layout.png | Bin 10569 -> 13269 bytes .../onboarding/content/onboarding-tour-agent.js | 6 ++ .../extensions/onboarding/content/onboarding.css | 4 ++ 8 files changed, 60 insertions(+), 38 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 49f5b6a37000..c146a83e26fe 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -347,9 +347,9 @@ pref("browser.download.panel.shown", true); pref("dom.securecontext.whitelist_onions", true); // Onboarding. -pref("browser.onboarding.tourset-version", 3); -pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); -pref("browser.onboarding.updatetour", "toolbar-update-8.5,security-update-8.5"); +pref("browser.onboarding.tourset-version", 4); +pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services"); +pref("browser.onboarding.updatetour", "toolbar-update-9.0,tor-network-9.0"); pref("browser.onboarding.skip-tour-button.hide", true); // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 2a4c81d69374..3753e55a81a1 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -72,11 +72,15 @@ const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([ "showInfo", // restricted to TOR_BROWSER_TARGETS_ALLOWED "showMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED "hideMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED + "showHighlight", // restricted to TOR_BROWSER_TARGETS_ALLOWED + "hideHighlight", // restricted to TOR_BROWSER_TARGETS_ALLOWED + "openPreferences", "closeTab", "torBrowserOpenSecurityLevelPanel", ]); const TOR_BROWSER_TARGETS_ALLOWED = new Set([ + "torBrowser-newIdentityButton", "torBrowser-circuitDisplay", "torBrowser-circuitDisplay-diagram", "torBrowser-circuitDisplay-newCircuitButton", @@ -136,6 +140,9 @@ var UITour = { torBrowserCircuitDisplayTarget("circuit-display-nodes")], ["torBrowser-circuitDisplay-newCircuitButton", torBrowserCircuitDisplayTarget("circuit-reload-button")], + ["torBrowser-newIdentityButton", { + query: "#new-identity-button", + }], [ "accountStatus", diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index d11e525b9f8c..29b6f68a7914 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -39,13 +39,12 @@ const PREF_WHITELIST = [ // Tor Browser tours: "onboarding-tour-tor-welcome", "onboarding-tour-tor-privacy", - "onboarding-tour-tor-network", + "onboarding-tour-tor-network-9-0", "onboarding-tour-tor-circuit-display", "onboarding-tour-tor-security", "onboarding-tour-tor-expect-differences", "onboarding-tour-tor-onion-services", - "onboarding-tour-tor-toolbar-update-8-5", - "onboarding-tour-tor-security-update-8-5", + "onboarding-tour-tor-toolbar-update-9-0", #if 0 // Firefox tours. To reduce conflicts when rebasing against newer Firefox // code, we use the preprocessor to omit this code block. diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 6d4dbfa35b40..4d991acf869d 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -119,19 +119,41 @@ var onboardingTourset = { return div; }, }, - "tor-network": { - id: "onboarding-tour-tor-network", + // In Tor Browser 9.0, we replaced the Tor Network panel with an updated one. + "tor-network-9.0": { + id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - instantComplete: true, + highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); - createOnboardingTourDescription(div, + let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-network.title", "onboarding.tour-tor-network.description"); + let additionalDesc = win.document.createElement("p"); + additionalDesc.className = "onboarding-tour-description-para2"; + additionalDesc.setAttribute("data-l10n-id", + "onboarding.tour-tor-network.description-para2"); + desc.appendChild(additionalDesc); + createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-network.png"); - createOnboardingTourButton(div, - "onboarding-tour-tor-network-button", "onboarding.tour-tor-network.button"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-network-action-button", "onboarding.tour-tor-network.action-button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + // The next button (right side) is a "Done" button if we are displaying + // the tour to users who updated their browser; otherwise, it is a + // button that takes the user to the next onboarding page. + let nextBtnID, nextBtnL10nID; + if (this._tourType === "update") { + // Using the onion services IDs here seems like a mistake, but it + // provides the functionality and translated string ("Done") we need. + nextBtnID = "onboarding-tour-tor-onion-services-next-button"; + nextBtnL10nID = "onboarding.tour-tor-onion-services.next-button"; + } else { + nextBtnID = "onboarding-tour-tor-network-button"; + nextBtnL10nID = "onboarding.tour-tor-network.button"; + } + createOnboardingTourButton(div, nextBtnID, nextBtnL10nID); return div; }, }, @@ -156,7 +178,6 @@ 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"); @@ -215,42 +236,27 @@ var onboardingTourset = { }, }, // Tour items for users who have updated their Tor Browser: - "toolbar-update-8.5": { - id: "onboarding-tour-tor-toolbar-update-8-5", + "toolbar-update-9.0": { + id: "onboarding-tour-tor-toolbar-update-9-0", 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"); + "onboarding.tour-tor-toolbar-update-9.0.title", "onboarding.tour-tor-toolbar-update-9.0.description"); + let additionalDesc = win.document.createElement("p"); + additionalDesc.className = "onboarding-tour-description-para2"; + additionalDesc.setAttribute("data-l10n-id", + "onboarding.tour-tor-toolbar-update-9.0.description-para2"); + desc.appendChild(additionalDesc); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-toolbar-layout.png"); - createOnboardingTourButton(div, - "onboarding-tour-tor-toolbar-next-button", "onboarding.tour-tor-toolbar-update-8.5.next-button"); - - return div; - }, - }, - "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"); - - createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security-level.png"); let btnContainer = createOnboardingTourButton(div, - "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); + "onboarding-tour-tor-toolbar-update-9-0-button", "onboarding.tour-tor-toolbar-update-9.0.button"); btnContainer.className = "onboarding-tour-tor-action-button-container"; - // It is confusing to use the two onion-services IDs below, but they - // provide the functionality and translated string ("Done") that we need. createOnboardingTourButton(div, - "onboarding-tour-tor-onion-services-next-button", "onboarding.tour-tor-onion-services.next-button"); + "onboarding-tour-tor-toolbar-next-button", "onboarding.tour-tor-toolbar-update-9.0.next-button"); return div; }, diff --git a/browser/extensions/onboarding/content/img/figure_tor-network.png b/browser/extensions/onboarding/content/img/figure_tor-network.png index fe0fa9408daa..87829397ab2a 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-network.png and b/browser/extensions/onboarding/content/img/figure_tor-network.png differ diff --git a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png index 624ef6514d39..6d8651e58c17 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png and b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png differ diff --git a/browser/extensions/onboarding/content/onboarding-tour-agent.js b/browser/extensions/onboarding/content/onboarding-tour-agent.js index a08320d0535a..7cdb10063f28 100644 --- a/browser/extensions/onboarding/content/onboarding-tour-agent.js +++ b/browser/extensions/onboarding/content/onboarding-tour-agent.js @@ -21,6 +21,12 @@ let onClick = evt => { case "onboarding-tour-tor-security-button": Mozilla.UITour.torBrowserOpenSecurityLevelPanel(); break; + case "onboarding-tour-tor-toolbar-update-9-0-button": + Mozilla.UITour.showHighlight("torBrowser-newIdentityButton", "zoom"); + break; + case "onboarding-tour-tor-network-action-button": + Mozilla.UITour.openPreferences("tor"); + break; #if 0 // Firefox onboarding actions. To reduce conflicts when rebasing against // newer Firefox code, we use the preprocessor to omit this code block. diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index f71ec1d13789..eb214de5e254 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -377,6 +377,10 @@ color: #420c5d; } +.onboarding-tour-description-para2 { + margin-top: 16px; +} + .onboarding-tour-description-suffix { margin-top: 6px; font-size: 13px;

1 0

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

10 Oct '19

commit 8505907fa63abe5dfb7e535ee693646d608f9a03 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 10 19:52:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- nb-NO/browserOnboarding.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb-NO/browserOnboarding.properties b/nb-NO/browserOnboarding.properties index 89bfd8e9a..251fa481f 100644 --- a/nb-NO/browserOnboarding.properties +++ b/nb-NO/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Gå til Tor Nettverk onboarding.tour-tor-network=Tor Nettverk onboarding.tour-tor-network.title=Reis et decentralisert nettverk. onboarding.tour-tor-network.description=Tor Nettleser forbinder deg med Tor-nettet som drives av tusenvis av frivillige rundt om i verden. I motsetning til en VPN er det ingen feilpunkt eller sentralisert enhet du må stole på for å kunne nyte 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.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=NYTT: Tor nettverksinnstillinger, inkluderer muligheten til å be om broer der Tor er blokkert, kan nå finnes i Innstillinger. +onboarding.tour-tor-network.action-button=Juster din Tor-nettverksinnstillinger onboarding.tour-tor-network.button=Gå til Kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning @@ -52,7 +52,7 @@ onboarding.tour-tor-toolbar=Verktøylinje 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.button=Hvordan be om en Ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor Nettverk # Circuit Display onboarding.

1 0

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

10 Oct '19

commit a461e71d860a71adbac85950607c9f6ac3abba64 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 10 19:45:31 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- nb/LC_MESSAGES/bridgedb.po | 260 +++++++++++++++++++++++---------------------- 1 file changed, 133 insertions(+), 127 deletions(-) diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po index 60e81a766..0441fd544 100644 --- a/nb/LC_MESSAGES/bridgedb.po +++ b/nb/LC_MESSAGES/bridgedb.po @@ -1,6 +1,6 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. # # Translators: # Allan Nordhøy <epost(a)anotheragency.no>, 2014 @@ -9,24 +9,44 @@ # Harald H. <haarektrans(a)gmail.com>, 2014 # Kristian Andre Henriksen <kris.andre.h(a)gmail.com>, 2015 # 81149148127a5edca7d06dcbfba79969, 2013 +# Mats Larsen <sumohd(a)tuta.io>, 2019 # Pål Fiksdal <plf715(a)gmail.com>, 2015 -# Per Thorsheim <transifex(a)thorsheim.net>, 2015 +# Per Thorsheim, 2015 # thor574 <thor.hovden(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-12-29 18:29+0000\n" -"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: 2019-10-10 19:25+0000\n" +"Last-Translator: Mats Larsen <sumohd(a)tuta.io>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.7.0\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to- +#. left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -38,177 +58,173 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." -msgstr "Beklager! Noe gikk galt med forespørselen din." +msgstr "" -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Innrapporter feil" +msgstr "" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" -msgstr "Kildekode" +msgstr "" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" -msgstr "Endringslogg" - -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Kontakt" +msgstr "" -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" -msgstr "Velg alt" +msgstr "" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Vis QR-kode" +msgstr "" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR-kode for dine brolinjer" +msgstr "" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Oisann!" +msgstr "" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Det oppsto en feil ved innhenting av din QR-kode." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for å kopiere dine brolinjer over på mobile og andre enheter." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Det er for tiden ingen tilgjengelige broer…" +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Kanskje du bør prøve %s gå tilbake til %s og velge en annen brotype!" +msgstr "" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "Steg %s1%s" +msgstr "" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Last ned %s Tor-nettleseren %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "Steg %s2%s" +msgstr "" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Tilknytt %s broer %s" +msgstr "" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "Steg %s3%s" +msgstr "" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nå %s legg til broer til Tor-nettleseren %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sB%sare gi meg noen broer!" +msgstr "" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Avanserte valg" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" -msgstr "Nei" +msgstr "" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" -msgstr "ingen" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sJ%sa!" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sT%silknytt broer" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Dette er en automatisert melding; ikke svar.]" +msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Her er dine broer:" +msgstr "" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Du har overskredet hastighetsbegrensningen. Ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre e-poster i denne tidsperioden vil bli ignorert." +msgstr "" #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "KOMMANDOer: (kombiner KOMMANDer to å angi flere valg samtidig)" +msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "Velkommen til BridgeDB!" +msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Nåværende støttede transport TYPEr:" +msgstr "" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hei, %s!" +msgstr "" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Hallo, lille venn!" +msgstr "" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" -msgstr "Offentlige nøkler" +msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -218,7 +234,7 @@ msgstr "Offentlige nøkler" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Denne e-posten ble laget med regnbuer, enhjørninger og stjerneskudd for %s på %s klokken %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -232,7 +248,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med å tilsløre dine tilkoblinger til Tor-nettverket, noe som gjør det\nvanskelig for noen som overvåker din internett-trafikk å fastsette hvorvidt du\nbruker Tor eller ei\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -240,7 +256,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Noen broer med IPv6-adresser er også tilgjelgelige, dog er noen pluggbare\nTransporter ikke IPv6-kompatible.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -254,136 +270,126 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Merk også, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke høres så tøft ut, men de kan fremdeles\nbehjelpe omgåelse av Internettsensur i de fleste fall.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" -msgstr "Hva er broer?" +msgstr "" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Broer %s er Tor-rutingsstafettoppsett som hjelper deg med å omgå sensur." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Jeg trenger en alternativ måte å få broer på!" +msgstr "" #: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "En annen måte tilknytte seg broer er å sende en e-post til %s. Merk at du må sende\ne-post fra en adresse tilhørende en av følgende e-posttilbydere:\n%s, %s eller %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "Broene mine virker ikke! Jeg trenger hjelp!" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Prøv å få med så mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prøvde å bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor måtte ha produsert, osv." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Her er dine bro-linjer:" +msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Tilknytt broer!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Gjør valg for brotype:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" -msgstr "Trenger du IPv6-adresser?" +msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" -msgstr "Trenger du en %s?" +msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Nettleseren din viser ikke bilder ordentlig." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Skriv inn bokstavene fra bildet ovenfor…" +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" -msgstr "Hvordan starte med bruk av dine broer" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "For å sette opp broer i Tor-nettleseren, gå først til %s siden for nedlasting av Tor-nettleser\n%s følg så instruksene for nedlasting og start av Tor-nettleseren." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Når 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk på 'oppsett' og følg\nveiviseren til den forespør:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Sensurerer, eller blokkerer på annen måte, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Velg 'Ja' og klikk så 'Neste'. For å sette opp de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde være klar til kamp! Hvis du får problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." -msgstr "Vis denne meldingen." +msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Be om broer med \"vanilla\" fabrikkoppsett." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Etterspør IPv6-broer." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Be om en pluggbar transport etter TYPE." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Få kopi av BridgeDBs offentlige GnuPG-nøkkel." +msgstr ""

1 0