Apply security slider improvements made on desktop back to mobile

added TorBrowserTeam201909R actualpoints::1 component::applications/tor browser owner::tbb-team parent::10760 points::0.25 priority::medium resolution::fixed severity::normal status::closed tbb-mobile tbb-parity tbb-security-slider tbb-torbutton type::enhancement labels

Should be this closed as a dup/replaced by #24855 (moved)?

Trac:
Status: new to needs_information

No. We could see it as part of it. I'll use #24855 (moved) as parent.

Trac:
Status: needs_information to new
Parent: N/A to #24855 (moved)

tbb-parity items.

Trac:
Keywords: N/A deleted, tbb-parity added

FWIW, now that #25658 (moved) landed we should cover those changes in this ticket.

We have tbb-parity now, unparenting.

Trac:
Parent: #24855 (moved) to N/A

I'm trying to merge the securityLevel.properties file into torbutton.dtd, and fixing the string duplication there. However, it seems that due to this string duplication there are some conflicts already. AFAIK for all these cases the translations should be exactly the same. I'm not sure what is the best way to proceed here, but these are the conflicts (after running import-translations.sh script):

ar 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 الصوت والفيديو (HTML5 media), و WebGL هي انقر للتشغيل 
 الصوت والفيديو يحتاج للنقر لتشغيله. 

ar 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 تعرّف على المزيد 
 تعرف على المزيد 

bn-BD 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safer.description3 
 অডিও ও ভিডিও (এইচটিএমএল৫ মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন 
 অডিও ও ভিডিও (এইচটিএমএল5 মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন 

bn-BD 
 torbutton.prefs.sec_safest_label 
 securityLevel.safest.level 
 নিরাপদ 
 সবচে’ নিরাপদ 

bn-BD 
 torbutton.prefs.sec_js_disabled 
 securityLevel.safest.description1 
 জাভাস্ক্রিপ্ট সব সাইটে ডিফল্ট দ্বারা নিষ্ক্রিয় করা হয়। 
 স্বয়ংক্রিয়ভাবে সকল সাইটে জাভাস্ক্রিপ্ট নিষ্ক্রিয়কৃত। 

bn-BD 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 অডিও ও ভিডিও (এইচটিএমএল৫ মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন 
 অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা। 

ca 
 torbutton.prefs.sec_safer_label 
 securityLevel.safer.level 
 Més segur. 
 Més segur 

ca 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 L'àudio, el vídeo (mitjans de comunicació HTML5) i WebGL són click-to-play.  
 L'àudio i el vídeo (mitjans de comunicació HTML5) són click-to-play. 

ca 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Apreneu-ne més 
 Aprèn més 

cs 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio, video (HTML5 média) a WebGL se přehrávají po kliknutí. 
 Audio a video (HTML5 média) se přehrávají po kliknutí. 

da 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Lyd og video (HTML5-medier) og WebGL er klik-for-at-afspille. 
 Lyd og video (HTML5-medier) er klik-for-at-afspille. 

de 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Ton und Bild (HTML5-Medien) und WebGL sind Click-to-Play. 
 Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden. 

el 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Οι ήχοι και τα βίντεο (μέσα HTML5) παίζουν, αφού γίνει κλικ για αναπαραγωγή. 

el 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Μάθετε περισσότερα 
 Μάθε περισσότερα 

es-AR 
 torbutton.prefs.sec_caption 
 securityLevel.securityLevel 
 Nivel de seguridad 
 Nivel de Seguridad 

es-AR 
 torbutton.prefs.sec_safest_label 
 securityLevel.safest.level 
 En extremo seguro 
 El más seguro 

es-AR 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Audio y video (medios HTML5) son cliquear-para-reproducir. 

es-AR 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Más informacion 
 Aprendé más 

es-ES 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio y vídeo (HTML5 media), y WebGL son click-to-play. 
 Audio y vídeo (media HTML5) son de tipo pulsar-para-reproducir. 

eu 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audioa eta bideoa (HTML5 media), eta WebGL erreproduzitzeko klikatu behar da. 
 Audio and video (HTML5 media) are click-to-play. 

fa 
 torbutton.prefs.sec_safer_label 
 securityLevel.safer.level 
 ایمن تر  
 ایمن تر 

fa 
 torbutton.prefs.sec_safest_label 
 securityLevel.safest.level 
 ایمن ترین  
 ایمن ترین 

fa 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 صدا و تصویر (رسانه HTML5) و WebGL قابل باز شدن با کلیک هستند. 
 صدا و ویدیو ( HTML5 رسانه ) برای بازی کلیک می‌کنند. 

fr 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Le son et la vidéo (médias HTML5) ainsi que WebGL sont « cliquer pour lire ». 
 Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». 

ga-IE 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm. 

he 
 torbutton.prefs.sec_standard_label 
 securityLevel.standard.level 
 תקני 
 תקנית 

he 
 torbutton.prefs.sec_safer_label 
 securityLevel.safer.level 
 בטוח יותר 
 בטוחה יותר 

he 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safer.description3 
 שמע ווידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן. 
 שמע, וידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן. 

he 
 torbutton.prefs.sec_safest_label 
 securityLevel.safest.level 
 הכי בטוח 
 הכי בטוחה 

he 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 שמע ווידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן. 
 שמע ווידיאו (מדית HTML5) הם לחץ־כדי־לנגן. 

hu 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Audió és videó (HTML5 média) kattintásra indul. 

id 
 torbutton.prefs.sec_safest_description 
 securityLevel.safest.summary 
 Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip. 
 Hanya mengizinkan fitur-fitur situs web yang diperlukan untuk menjalankan situs web statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip. 

id 
 torbutton.prefs.sec_js_disabled 
 securityLevel.safest.description1 
 JavaScript dinonaktifkan secara default di semua situs. 
 JavaScript dinonaktifkan secara bawaan di semua situs. 

id 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio dan video (media HTML5), dan WebGL dijalankan saat diklik. 
 Audio dan video (media HTML5) dijalankan saat diklik. 

id 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Pelajari lebih lanjut 
 Pelajari Selengkapnya 

is 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Hljóð og myndskeið (HTML5-gagnamiðla) ásamt WebGL þarf að smella á til að spila. 
 Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila. 

it 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio, video (media HTML5) e WebGL sono click-to-play. 
 Audio e video (media HTML5) sono click-to-play. 

ja 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 オーディオとビデオ(HTML5メディア)はクリックすると再生されます。 

ka 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 ხმოვანი და ვიდეოფაილები (HTML5), აგრეთვე WebGL ეშვება მხოლოდ დაწკაპებით. 
 ხმოვანი და ვიდეოფაილები (HTML5) ეშვება მხოლოდ დაწკაპებით. 

ko 
 torbutton.prefs.sec_safer_description 
 securityLevel.safer.summary 
 이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다. 
 이 설정을 하여 흔히 위험한 웹사이트의 기능이 비활성화하면, 일부 사이트의 기능들을 사용할 수 없습니다. 

ko 
 torbutton.prefs.sec_js_on_https_sites_only 
 securityLevel.safer.description1 
 JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다. 
 HTTPS을 적용되지 않은 사이트에서는 JavaScript가 비활성화됩니다. 

ko 
 torbutton.prefs.sec_limit_typography 
 securityLevel.safer.description2 
 일부 글꼴이며 수학기호가 비활성화 됩니다. 
 일부 글꼴과 수학기호가 비활성화됩니다. 

ko 
 torbutton.prefs.sec_safest_description 
 securityLevel.safest.summary 
 정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다. 
 정적 사이트와 기본 서비스에 필요한 기능에만 허용됩니다. 이 변경사항들은 이미지, 미디어, 스크립트에 영향을 줍니다. 

ko 
 torbutton.prefs.sec_js_disabled 
 securityLevel.safest.description1 
 자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다. 
 기본 설정으로 모든 사이트에서 자바스크립트는 비활성화되어 있습니다. 

ko 
 torbutton.prefs.sec_limit_graphics_and_typography 
 securityLevel.safest.description2 
 일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다. 
 일부 글꼴과 아이콘, 수학기호, 이미지는 비활성화 됩니다. 

ko 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 오디오와 동영상(HTML5 media) 보려면 누르십시오. 

nb-NO 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Lyd og video (HTML5 media), og WebGL er klikk-å-spille. 
 Lyd og video (HTML5-media) må klikkes for å spilles av. 

nl 
 torbutton.prefs.sec_safer_description 
 securityLevel.safer.summary 
 Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen. 
 Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen. 

nl 
 torbutton.prefs.sec_js_on_https_sites_only 
 securityLevel.safer.description1 
 JavaScript zijn uitgeschakeld op non-HTTP sites. 
 JavaScript is uitgeschakeld op niet-HTTPS-websites. 

nl 
 torbutton.prefs.sec_safest_description 
 securityLevel.safest.summary 
 Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts. 
 Staat alleen websitefuncties toe die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts. 

nl 
 torbutton.prefs.sec_js_disabled 
 securityLevel.safest.description1 
 Javascript zijn standaard uitgeschakeld op alle sites. 
 JavaScript is standaard uitgeschakeld op alle websites. 

nl 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Audio en video (HTML5-media) zijn klikken-voor-afspelen. 

nl 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Leer Meer 
 Meer info 

pl 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio i wideo (media HTML5) i WebGL kliknij, aby odtworzyć. 
 Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć". 

pt-BR 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Áudio e vídeo (mídia HTML5) e WebGL são reproduzidos com um clique. 
 Clicar para tocar ou ver áudio ou vídeo (mídia HTML5). 

pt-BR 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Aprenda mais 
 Saber mais 

ru 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Аудио, видео (медиа HTML5) и WebGL проигрываются при нажатии. 
 Аудио и видео (HTML5 медиа) проигрываются только после клика. 

ru 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 Подробнее 
 Узнать больше 

sv-SE 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Ljud och video (HTML5-media) och WebGL är klicka-för-att-spela. 
 Ljud och video (HTML5-media) är klicka-för-att-spel. 

tr 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Ses ve görüntü (HTML5 ortamı) ve WebGL tıklayıp oynatılabilir. 
 Ses ve görüntüler (HTML5 ortamı) tıklayarak çalıştırılabilir. 

vi 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 Audio and video (HTML5 media), and WebGL are click-to-play. 
 Âm thanh và video (HTML5 media) phải bấm-để-phát.  

zh-CN 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 点击播放音频或视频（HTML5 媒体）和WebGL。 
 点击播放音频或视频（HTML5 媒体）。 

zh-TW 
 torbutton.prefs.sec_caption 
 securityLevel.securityLevel 
 安全等級 
 安全性等級 

zh-TW 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safer.description3 
 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。 
 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放 

zh-TW 
 torbutton.prefs.sec_click_to_play_media 
 securityLevel.safest.description3 
 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。 
 聲音和影片 (HTML5 媒體) 要點擊播放 

zh-TW 
 torbutton.prefs.sec_learn_more_label 
 securityLevel.learnMore 
 繼續閱讀 
 了解更多

Trac:
Status: new to needs_information

Trac:
Parent: N/A to #10760 (moved)

Okay, I think in doubt use the ones from securityLevel.properties as they should be newer. However, I just realized we forgot to adapt securityLevel.safest.description3. It should contain the WebGL part as well. Thus, it should match securityLevel.safer.description3. If there are more mistakes then we should fix those in subsequent bugs.

Trac:
Status: needs_information to new
Keywords: N/A deleted, TorBrowserTeam201908 added

Patches in https://github.com/acatarineu/torbutton/commits/24653 (last two commits) and https://github.com/acatarineu/tor-browser/commit/24653.

Trac:
Status: new to needs_review
Keywords: TorBrowserTeam201908 deleted, TorBrowserTeam201908R added

Moving tickets to September

Trac:
Keywords: N/A deleted, TorBrowserTeam201909 added

No August anymore.

Trac:
Keywords: TorBrowserTeam201908R deleted, TorBrowserTeam201909R added

Trac:
Points: N/A to 0.25

Replying to acat:

Patches in https://github.com/acatarineu/torbutton/commits/24653 (last two commits) and https://github.com/acatarineu/tor-browser/commit/24653.

Could you leave the security settings strings in one block? Right now there are circuit display ones in the middle with your changes, which is a bit confusing.

Trac:
Keywords: TorBrowserTeam201909R deleted, N/A added
Status: needs_review to needs_revision

Revised torbutton patch in https://github.com/acatarineu/torbutton/commits/24653+1 (last two commits). Besides the requested changes, I updated strings again and rebased to current master.

Trac:
Status: needs_revision to needs_review
Keywords: N/A deleted, TorBrowserTeam201909R added

Okay, the Torbutton changes look good to me now. A small fixup for the browser patch is needed: please update the fallback strings for click_to_play_media and custom_summary according to the version that is in the en-US torbutton.dtd of your branch.

Trac:
Keywords: TorBrowserTeam201909R deleted, N/A added
Status: needs_review to needs_revision

Fixed in https://github.com/acatarineu/tor-browser/commit/24653+1. Isn't custom_summary already the same as in torbutton?

Trac:
Status: needs_revision to needs_review

Replying to acat:

Fixed in https://github.com/acatarineu/tor-browser/commit/24653+1. Isn't custom_summary already the same as in torbutton?

Right, my bad. I was looking in the browser without realizing the scrollbar. So, I thought the string was cut but it wasn't. Thanks. Now, could you just remove the superfluous whitespace on the empty lines in

+    });
+  
+    // Use the DOM parser to resolve the entity and extract its real value
+    let header = `<?xml version="1.0"?><!DOCTYPE elem [${locations.join("")}]>`;
+    let elem = `<elem id="elementID">&${id};</elem>`;
+    let doc = domParser.parseFromString(header + elem, "text/xml");
+    let element = doc.querySelector("elem[id='elementID']");
+  
+    if (element === null) {
+      throw new Error(`Entity with id='${id}' hasn't been found`);
+    }
+  
+    return element.textContent;

git is not happy with those. :)

Trac:
Status: needs_review to needs_revision

Done in https://github.com/acatarineu/tor-browser/commit/24653+2.

Trac:
Status: needs_revision to needs_review
Keywords: TorBrowserTeam201909 deleted, TorBrowserTeam201909R added

Looks good, now. I cherry-picked the browser patch onto tor-browser-68.1.0esr-9.0-2 (commit 3b5b0d6d502d712734c2c5b7e35c0d29e5f19204) and applied the Torbutton one (after updating the translations on master) on top of master as commit 903d676ccf33e36938438a595b71e781ef13bbe1.

Trac:
Resolution: N/A to fixed
Status: needs_review to closed

Trac:
Actualpoints: N/A to 1

closed

changed time estimate to 2h

added 8h of time spent

mentioned in issue #25658 (moved)

mentioned in issue #30429 (moved)

mentioned in issue #31286 (moved)

moved to tpo/applications/tor-browser#24653 (closed)

Apply security slider improvements made on desktop back to mobile

Child items 0

Activity