tor-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
August 2014
- 21 participants
- 1599 discussions

[tor-launcher/master] Bug 12444: Feedback when “Copy Tor Log” is clicked.
by brade@torproject.org 20 Aug '14
by brade@torproject.org 20 Aug '14
20 Aug '14
commit 561440e8d64ca9b60f09d2b6869c4d07c5d06834
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Aug 20 08:21:45 2014 -0400
Bug 12444: Feedback when “Copy Tor Log” is clicked.
Show a transient popup near the "Copy Tor Log To Clipboard" button after
is is clicked. The popup panel fades away after 4 seconds and can also
be dismissed by clicking anywhere.
---
src/chrome/content/network-settings-overlay.xul | 4 ++++
src/chrome/content/network-settings-wizard.xul | 1 +
src/chrome/content/network-settings.js | 23 ++++++++++++++++++++++-
src/chrome/content/network-settings.xul | 1 +
src/chrome/locale/en/torlauncher.properties | 2 ++
src/chrome/skin/network-settings.css | 5 +++++
src/components/tl-protocol.js | 8 ++++++--
7 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index 6422802..c9a6a82 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -124,5 +124,9 @@
</html:li>
</html:ol>
</vbox>
+ <panel id="copyLogFeedbackPanel" type="arrow" fade="slow"
+ onclick="closeCopyLogFeedbackPanel()">
+ <description flex="1" />
+ </panel>
</overlay>
diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 70d1bcf..6682fdd 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -189,4 +189,5 @@
<hbox pack="start">
<label id="forAssistance" />
</hbox>
+ <panel id="copyLogFeedbackPanel" />
</wizard>
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 5f3f698..518d16d 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -713,9 +713,30 @@ function onCancel()
function onCopyLog()
{
+ // Copy tor log messages to the system clipboard.
var chSvc = Cc["@mozilla.org/widget/clipboardhelper;1"]
.getService(Ci.nsIClipboardHelper);
- chSvc.copyString(gProtocolSvc.TorGetLog());
+ let countObj = { value: 0 };
+ chSvc.copyString(gProtocolSvc.TorGetLog(countObj));
+
+ // Display a feedback popup that fades away after a few seconds.
+ let forAssistance = document.getElementById("forAssistance");
+ let panel = document.getElementById("copyLogFeedbackPanel");
+ if (forAssistance && panel)
+ {
+ panel.firstChild.textContent = TorLauncherUtil.getFormattedLocalizedString(
+ "copiedNLogMessages", [countObj.value], 1);
+ let rectObj = forAssistance.getBoundingClientRect();
+ panel.openPopup(null, null, rectObj.left, rectObj.top, false, false);
+ }
+}
+
+
+function closeCopyLogFeedbackPanel()
+{
+ let panel = document.getElementById("copyLogFeedbackPanel");
+ if (panel && (panel.state =="open"))
+ panel.hidePopup();
}
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul
index a81a5f0..4f98559 100644
--- a/src/chrome/content/network-settings.xul
+++ b/src/chrome/content/network-settings.xul
@@ -85,4 +85,5 @@
</deck>
<spring flex="1" />
<label id="forAssistance" />
+ <panel id="copyLogFeedbackPanel" />
</dialog>
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
index 816d831..20f6db2 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -37,6 +37,8 @@ torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
+torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message.
+
torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 03f84d7..60f1ef2 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -148,6 +148,11 @@ dialog .help {
margin-bottom: 8px;
}
+#copyLogFeedbackPanel {
+ margin: -15px 0px 0px 0px;
+ max-width: 34em;
+}
+
/* Increase font size on Windows for readability */
.os-windows div,
.os-windows label,
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index 9c4d957..09ec468 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -458,7 +458,8 @@ TorProtocolService.prototype =
},
// Returns captured log message as a text string (one message per line).
- TorGetLog: function()
+ // If aCountObj is passed, aCountObj.value is set to the message count.
+ TorGetLog: function(aCountObj)
{
let s = "";
if (this.mTorLog)
@@ -468,7 +469,10 @@ TorProtocolService.prototype =
let dateFormat = dateFmtSvc.dateFormatShort;
let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour;
let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n";
- for (let i = 0; i < this.mTorLog.length; ++i)
+ let count = this.mTorLog.length;
+ if (aCountObj)
+ aCountObj.value = count;
+ for (let i = 0; i < count; ++i)
{
let logObj = this.mTorLog[i];
let secs = logObj.date.getSeconds();
1
0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation@torproject.org 20 Aug '14
by translation@torproject.org 20 Aug '14
20 Aug '14
commit 181585e701a1858681c510abc0dc208713ebde48
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Aug 20 10:45:46 2014 +0000
Update translations for torbutton-torbuttonproperties
---
es/torbutton.properties | 8 ++++----
zh_CN/torbutton.properties | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/es/torbutton.properties b/es/torbutton.properties
index b30efd7..f40fc06 100644
--- a/es/torbutton.properties
+++ b/es/torbutton.properties
@@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daña
torbutton.popup.never_ask_again = No volver a preguntar
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
-canvas.notNow=Not Now
+canvas.siteprompt=Este sitio web (%s) intentó extraer datos de imagen de un lienzo HTML5, que podrían usarse para identificar de forma única su computadora.\n\n¿Debe permitir el Navegador Tor a este sitio web extraer los datos de imagen de lienzos HTML5?
+canvas.notNow=Ahora no
canvas.notNowAccessKey=N
-canvas.allow=Allow in the future
+canvas.allow=Permitir en el futuro
canvas.allowAccessKey=P
-canvas.never=Never for this site (recommended)
+canvas.never=Nunca para este sitio (recomendado)
canvas.neverAccessKey=u
diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index e1939c6..2722495 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与
torbutton.popup.never_ask_again = 不再询问
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
-canvas.notNow=Not Now
+canvas.siteprompt=此网站 (%S) 在尝试提取 HTML5 Canva 的图像数据,这可能被用作您的计算机的唯一性识别符。\n\nTor Browser 应该允许此网站提取 HTML5 Canva 的图像数据吗?
+canvas.notNow=暂不
canvas.notNowAccessKey=N
-canvas.allow=Allow in the future
+canvas.allow=此后允许
canvas.allowAccessKey=A
-canvas.never=Never for this site (recommended)
+canvas.never=永不允许此网站(推荐)
canvas.neverAccessKey=e
1
0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation@torproject.org 20 Aug '14
by translation@torproject.org 20 Aug '14
20 Aug '14
commit 088e1272583248d88b7af9d42294ddb47035e76d
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Aug 20 09:45:35 2014 +0000
Update translations for tor-launcher-properties_completed
---
es_AR/torlauncher.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/es_AR/torlauncher.properties b/es_AR/torlauncher.properties
index cd0f78a..4cb19c1 100644
--- a/es_AR/torlauncher.properties
+++ b/es_AR/torlauncher.properties
@@ -3,8 +3,8 @@
torlauncher.error_title=Lanzador de Tor
-torlauncher.tor_exited=Salida inesperada de Tor
-torlauncher.tor_connection_lost=Se ha perdido la conexión a la red de Tor.
+torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor envía una copia de tu archivo de registro de Tor al equipo de soporte técnico.
+torlauncher.tor_exited2=Reiniciar Tor no cerrará las pestañas de navegación.
torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control
torlauncher.tor_failed_to_start=Fallo al iniciar Tor
torlauncher.tor_control_failed=Falló toma de control de Tor
@@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan
torlauncher.recommended_bridge=(recomendado)
torlauncher.connect=Conectar
-torlauncher.reconnect=Volver a conectar
+torlauncher.restart_tor=Reiniciar Tor
torlauncher.quit=Quitar
torlauncher.quit_win=Salir
torlauncher.done=Hecho
1
0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation@torproject.org 20 Aug '14
by translation@torproject.org 20 Aug '14
20 Aug '14
commit 756f00f0ef2010d49fce4e0aeb704f8eb1b2d9b4
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Aug 20 09:45:32 2014 +0000
Update translations for tor-launcher-properties
---
es_AR/torlauncher.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/es_AR/torlauncher.properties b/es_AR/torlauncher.properties
index 3f6f960..4cb19c1 100644
--- a/es_AR/torlauncher.properties
+++ b/es_AR/torlauncher.properties
@@ -3,8 +3,8 @@
torlauncher.error_title=Lanzador de Tor
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor envía una copia de tu archivo de registro de Tor al equipo de soporte técnico.
+torlauncher.tor_exited2=Reiniciar Tor no cerrará las pestañas de navegación.
torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control
torlauncher.tor_failed_to_start=Fallo al iniciar Tor
torlauncher.tor_control_failed=Falló toma de control de Tor
1
0

20 Aug '14
commit 37134b716123ac00ec9f48776332e314d859ea99
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Aug 20 09:45:26 2014 +0000
Update translations for torbirdy
---
es_AR/torbirdy.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd
index 0a7dd74..d764fff 100644
--- a/es_AR/torbirdy.dtd
+++ b/es_AR/torbirdy.dtd
@@ -32,7 +32,7 @@
<!ENTITY torbirdy.prefs.socks_host.key "h">
<!ENTITY torbirdy.prefs.socks_port.label "Puerto:">
<!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.label "Torificación Transparente (advertencia: requiere transproxy personalizado o Tor router)">
<!ENTITY torbirdy.prefs.torification.key "t">
<!ENTITY torbirdy.prefs.global "Global">
<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
1
0

[tor-browser-bundle/master] We want to have nightlies with the new OpenSSL.
by gk@torproject.org 20 Aug '14
by gk@torproject.org 20 Aug '14
20 Aug '14
commit 81d698cab574c6fa2788362222b695b79752bf94
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Aug 20 11:27:35 2014 +0000
We want to have nightlies with the new OpenSSL.
---
gitian/versions.nightly | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 0462eae..c65cf22 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -27,7 +27,7 @@ MEEK_TAG=master
GITIAN_TAG=tor-browser-builder-3.x-6
-OPENSSL_VER=1.0.1h
+OPENSSL_VER=1.0.1i
GMP_VER=5.1.3
FIREFOX_LANG_VER=$FIREFOX_VERSION
BINUTILS_VER=2.24
1
0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation@torproject.org 20 Aug '14
by translation@torproject.org 20 Aug '14
20 Aug '14
commit 4a466e39b98326239774c394e8fa66b091d5938b
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Aug 20 09:17:39 2014 +0000
Update translations for torbutton-torbuttonproperties
---
ach/torbutton.properties | 8 +++++---
ady/torbutton.properties | 8 +++++---
af/torbutton.properties | 8 +++++---
ak/torbutton.properties | 8 +++++---
am/torbutton.properties | 8 +++++---
ar/torbutton.properties | 8 +++++---
arn/torbutton.properties | 8 +++++---
ast/torbutton.properties | 8 +++++---
az/torbutton.properties | 8 +++++---
be/torbutton.properties | 8 +++++---
bg/torbutton.properties | 8 +++++---
bn/torbutton.properties | 8 +++++---
bn_IN/torbutton.properties | 8 +++++---
bo/torbutton.properties | 8 +++++---
br/torbutton.properties | 8 +++++---
bs/torbutton.properties | 8 +++++---
ca/torbutton.properties | 8 +++++---
cs/torbutton.properties | 8 +++++---
csb/torbutton.properties | 8 +++++---
cv/torbutton.properties | 8 +++++---
cy/torbutton.properties | 8 +++++---
da/torbutton.properties | 8 +++++---
de/torbutton.properties | 8 +++++---
dz/torbutton.properties | 8 +++++---
el/torbutton.properties | 8 +++++---
en/torbutton.properties | 8 +++++---
en_GB/torbutton.properties | 8 +++++---
eo/torbutton.properties | 8 +++++---
es/torbutton.properties | 8 +++++---
es_AR/torbutton.properties | 8 +++++---
es_CL/torbutton.properties | 8 +++++---
es_CO/torbutton.properties | 8 +++++---
es_MX/torbutton.properties | 8 +++++---
et/torbutton.properties | 8 +++++---
eu/torbutton.properties | 8 +++++---
fa/torbutton.properties | 8 +++++---
fi/torbutton.properties | 8 +++++---
fil/torbutton.properties | 8 +++++---
fo/torbutton.properties | 8 +++++---
fr/torbutton.properties | 8 +++++---
fr_CA/torbutton.properties | 8 +++++---
fur/torbutton.properties | 8 +++++---
fy/torbutton.properties | 8 +++++---
ga/torbutton.properties | 8 +++++---
gl/torbutton.properties | 8 +++++---
gu/torbutton.properties | 8 +++++---
gu_IN/torbutton.properties | 8 +++++---
gun/torbutton.properties | 8 +++++---
ha/torbutton.properties | 8 +++++---
he/torbutton.properties | 8 +++++---
hi/torbutton.properties | 8 +++++---
hr/torbutton.properties | 8 +++++---
hr_HR/torbutton.properties | 8 +++++---
ht/torbutton.properties | 8 +++++---
hu/torbutton.properties | 8 +++++---
hy/torbutton.properties | 8 +++++---
hy_AM/torbutton.properties | 8 +++++---
ia/torbutton.properties | 8 +++++---
id/torbutton.properties | 8 +++++---
is/torbutton.properties | 8 +++++---
it/torbutton.properties | 8 +++++---
ja/torbutton.properties | 8 +++++---
jv/torbutton.properties | 8 +++++---
ka/torbutton.properties | 8 +++++---
kk/torbutton.properties | 8 +++++---
km/torbutton.properties | 8 +++++---
kn/torbutton.properties | 8 +++++---
ko/torbutton.properties | 8 +++++---
ko_KR/torbutton.properties | 8 +++++---
ku/torbutton.properties | 8 +++++---
kw/torbutton.properties | 8 +++++---
ky/torbutton.properties | 8 +++++---
lb/torbutton.properties | 8 +++++---
lg/torbutton.properties | 8 +++++---
ln/torbutton.properties | 8 +++++---
lo/torbutton.properties | 8 +++++---
lt/torbutton.properties | 8 +++++---
lv/torbutton.properties | 8 +++++---
mg/torbutton.properties | 8 +++++---
mi/torbutton.properties | 8 +++++---
mk/torbutton.properties | 8 +++++---
ml/torbutton.properties | 8 +++++---
mn/torbutton.properties | 8 +++++---
mr/torbutton.properties | 8 +++++---
ms_MY/torbutton.properties | 8 +++++---
mt/torbutton.properties | 8 +++++---
my/torbutton.properties | 8 +++++---
nah/torbutton.properties | 8 +++++---
nap/torbutton.properties | 8 +++++---
nb/torbutton.properties | 8 +++++---
nds/torbutton.properties | 8 +++++---
ne/torbutton.properties | 8 +++++---
nl/torbutton.properties | 8 +++++---
nl_BE/torbutton.properties | 8 +++++---
nn/torbutton.properties | 8 +++++---
nso/torbutton.properties | 8 +++++---
oc/torbutton.properties | 8 +++++---
or/torbutton.properties | 8 +++++---
pa/torbutton.properties | 8 +++++---
pap/torbutton.properties | 8 +++++---
pl/torbutton.properties | 8 +++++---
pms/torbutton.properties | 8 +++++---
ps/torbutton.properties | 8 +++++---
pt/torbutton.properties | 8 +++++---
pt_BR/torbutton.properties | 8 +++++---
ro/torbutton.properties | 8 +++++---
ru/torbutton.properties | 8 +++++---
ru(a)petr1708/torbutton.properties | 8 +++++---
scn/torbutton.properties | 8 +++++---
sco/torbutton.properties | 8 +++++---
si_LK/torbutton.properties | 8 +++++---
sk/torbutton.properties | 8 +++++---
sk_SK/torbutton.properties | 8 +++++---
sl/torbutton.properties | 8 +++++---
sl_SI/torbutton.properties | 8 +++++---
sn/torbutton.properties | 8 +++++---
so/torbutton.properties | 8 +++++---
son/torbutton.properties | 8 +++++---
sq/torbutton.properties | 8 +++++---
sr/torbutton.properties | 8 +++++---
sr(a)latin/torbutton.properties | 8 +++++---
st/torbutton.properties | 8 +++++---
su/torbutton.properties | 8 +++++---
sv/torbutton.properties | 8 +++++---
sw/torbutton.properties | 8 +++++---
szl/torbutton.properties | 8 +++++---
ta/torbutton.properties | 8 +++++---
te/torbutton.properties | 8 +++++---
te_IN/torbutton.properties | 8 +++++---
tg/torbutton.properties | 8 +++++---
th/torbutton.properties | 8 +++++---
ti/torbutton.properties | 8 +++++---
tk/torbutton.properties | 8 +++++---
tr/torbutton.properties | 8 +++++---
uk/torbutton.properties | 8 +++++---
ur/torbutton.properties | 8 +++++---
ur_PK/torbutton.properties | 8 +++++---
uz/torbutton.properties | 8 +++++---
ve/torbutton.properties | 8 +++++---
vi/torbutton.properties | 8 +++++---
wa/torbutton.properties | 8 +++++---
wo/torbutton.properties | 8 +++++---
zh_CN/torbutton.properties | 8 +++++---
zh_HK/torbutton.properties | 8 +++++---
zh_TW/torbutton.properties | 8 +++++---
zu/torbutton.properties | 8 +++++---
146 files changed, 730 insertions(+), 438 deletions(-)
diff --git a/ach/torbutton.properties b/ach/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ach/torbutton.properties
+++ b/ach/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ady/torbutton.properties b/ady/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ady/torbutton.properties
+++ b/ady/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/af/torbutton.properties b/af/torbutton.properties
index feb2a43..d23c67d 100644
--- a/af/torbutton.properties
+++ b/af/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ak/torbutton.properties b/ak/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ak/torbutton.properties
+++ b/ak/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/am/torbutton.properties b/am/torbutton.properties
index feb2a43..d23c67d 100644
--- a/am/torbutton.properties
+++ b/am/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ar/torbutton.properties b/ar/torbutton.properties
index 221eecd..eedcea5 100644
--- a/ar/torbutton.properties
+++ b/ar/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = البرامج الإضافية مثل فلا
torbutton.popup.never_ask_again = لا تسألني مرة اخري
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=حاول هذا الموقع (%S) الحصول علي بيانات لصورة من على سطح الرسم. ولأن بيانات الصور من على سطح الرسم يمكن استخدامها لمعرفة معلومات عن حاسبك، لذلك فقط تم تزود صورة فارغة هذه المرة.
-canvas.allow=اسمح في المستقبل
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=ا
-canvas.never=مطلقاً لهذا الموقع
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=ط
diff --git a/arn/torbutton.properties b/arn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/arn/torbutton.properties
+++ b/arn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ast/torbutton.properties b/ast/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ast/torbutton.properties
+++ b/ast/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/az/torbutton.properties b/az/torbutton.properties
index fee1c0e..3369b3b 100644
--- a/az/torbutton.properties
+++ b/az/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/be/torbutton.properties b/be/torbutton.properties
index 1f3d8e1..2e690fb 100644
--- a/be/torbutton.properties
+++ b/be/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/bg/torbutton.properties b/bg/torbutton.properties
index 968f724..0f95af7 100644
--- a/bg/torbutton.properties
+++ b/bg/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/bn/torbutton.properties b/bn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/bn/torbutton.properties
+++ b/bn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/bn_IN/torbutton.properties b/bn_IN/torbutton.properties
index feb2a43..d23c67d 100644
--- a/bn_IN/torbutton.properties
+++ b/bn_IN/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/bo/torbutton.properties b/bo/torbutton.properties
index feb2a43..d23c67d 100644
--- a/bo/torbutton.properties
+++ b/bo/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/br/torbutton.properties b/br/torbutton.properties
index 7988a29..e0c3fff 100644
--- a/br/torbutton.properties
+++ b/br/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Arabat goulenn diganin en-dro
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Aotren diwezhatoc'h
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Gwech ebet evit al lec'hienn-mañ
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/bs/torbutton.properties b/bs/torbutton.properties
index c107dd0..2bd9311 100644
--- a/bs/torbutton.properties
+++ b/bs/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ca/torbutton.properties b/ca/torbutton.properties
index 80be9d7..cd61006 100644
--- a/ca/torbutton.properties
+++ b/ca/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva
torbutton.popup.never_ask_again = No torneu a preguntar
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Permetre en el futur
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Mai per aquest lloc
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/cs/torbutton.properties b/cs/torbutton.properties
index 15e7098..b120577 100644
--- a/cs/torbutton.properties
+++ b/cs/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/csb/torbutton.properties b/csb/torbutton.properties
index feb2a43..d23c67d 100644
--- a/csb/torbutton.properties
+++ b/csb/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/cv/torbutton.properties b/cv/torbutton.properties
index feb2a43..d23c67d 100644
--- a/cv/torbutton.properties
+++ b/cv/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/cy/torbutton.properties b/cy/torbutton.properties
index e6a98a7..6a35768 100644
--- a/cy/torbutton.properties
+++ b/cy/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/da/torbutton.properties b/da/torbutton.properties
index 3ce3105..d0b3ca6 100644
--- a/da/torbutton.properties
+++ b/da/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Udvidelsesmoduler såsom Flash kan skade sikke
torbutton.popup.never_ask_again = Spørg mig aldrig igen
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Dette websted (%S) forsøgte at tilgå billededata på et lærred (canvas). Da billededata for lærreder kan anvendes til at afdække information om din maskine, så blev der sendt tomme billeddata denne gang.
-canvas.allow=Tillad i fremtiden
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=T
-canvas.never=Aldrig for dette sted
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=L
diff --git a/de/torbutton.properties b/de/torbutton.properties
index 9fd9766..1d07c03 100644
--- a/de/torbutton.properties
+++ b/de/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph
torbutton.popup.never_ask_again = Nicht mehr nachfragen
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Die Internetseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas-Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Internetseite geschickt.
-canvas.allow=In Zukunft Erlauben
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=I
-canvas.never=Niemals für diese Internetseite
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=N
diff --git a/dz/torbutton.properties b/dz/torbutton.properties
index feb2a43..d23c67d 100644
--- a/dz/torbutton.properties
+++ b/dz/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/el/torbutton.properties b/el/torbutton.properties
index e1bf178..92b09f1 100644
--- a/el/torbutton.properties
+++ b/el/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins όπως το Flash μπορουν ν
torbutton.popup.never_ask_again = Καμμια ερωτηση ξανα
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Αυτός ο ιστότοπος (%S) προσπάθησε να αποκτήση πρόσβαση σε δεδομένα εικόνων πάνω σε ένα καμβά. Από την στιγμή που δεδομένα εικόνων σε καμβά μπορούν να χρησιμοποιηθούν για να ανακαλυφθούν πληροφορίες σχετικές με τον υπολογιστή σας, κενά δεδομένα εικόνας επιστράφηκαν αυτή τη φορά.
-canvas.allow=Να επιτρέπεται στο Μέλλον
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=Α
-canvas.never=Ποτέ για αυτό τον ιστότοπο
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=ε
diff --git a/en/torbutton.properties b/en/torbutton.properties
index feb2a43..d23c67d 100644
--- a/en/torbutton.properties
+++ b/en/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/en_GB/torbutton.properties b/en_GB/torbutton.properties
index feb2a43..d23c67d 100644
--- a/en_GB/torbutton.properties
+++ b/en_GB/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/eo/torbutton.properties b/eo/torbutton.properties
index d7be3a0..e0664bb 100644
--- a/eo/torbutton.properties
+++ b/eo/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=P
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/es/torbutton.properties b/es/torbutton.properties
index ef75962..b30efd7 100644
--- a/es/torbutton.properties
+++ b/es/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daña
torbutton.popup.never_ask_again = No volver a preguntar
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Este sitio web (%S) trató de acceder a los metadatos de una imagen. Como los metadatos de la imágenes puede usarse para revelar información acerca de su computadora, en esta ocasión se ha respondido con metadatos en blanco.
-canvas.allow=Permitir en el futuro
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=P
-canvas.never=Nunca para este sitio
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=u
diff --git a/es_AR/torbutton.properties b/es_AR/torbutton.properties
index 9ef06fd..b49124e 100644
--- a/es_AR/torbutton.properties
+++ b/es_AR/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = No preguntarme de nuevo
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Permitir en el futuro
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Ahora no
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=Un
-canvas.never=Nunca para este sitio
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/es_CL/torbutton.properties b/es_CL/torbutton.properties
index feb2a43..d23c67d 100644
--- a/es_CL/torbutton.properties
+++ b/es_CL/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/es_CO/torbutton.properties b/es_CO/torbutton.properties
index feb2a43..d23c67d 100644
--- a/es_CO/torbutton.properties
+++ b/es_CO/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/es_MX/torbutton.properties b/es_MX/torbutton.properties
index 8753bbe..282ae8e 100644
--- a/es_MX/torbutton.properties
+++ b/es_MX/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins como Flash pueden dañar su privacidad
torbutton.popup.never_ask_again = No preguntarme de nuevo
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Este sitio web (%S) trató de acceder a datos de imagen en lienzo. Ya que los datos de las imágenes en lienzo pueden ser usados para descubrir información sobre su computador, datos de imagen vacía fueron devueltos esta vez.
-canvas.allow=Permitir en el futuro
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Nunca para este sitio
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/et/torbutton.properties b/et/torbutton.properties
index 6def594..26e5794 100644
--- a/et/torbutton.properties
+++ b/et/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Ära küsi seda kunagi enam
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Luba tulevikus
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Mitte kunagi sellel lehel
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/eu/torbutton.properties b/eu/torbutton.properties
index 15b29be..fdff847 100644
--- a/eu/torbutton.properties
+++ b/eu/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta
torbutton.popup.never_ask_again = Ez nazazu galdetu berriz
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Webgune honek (%S) oihal bateko irudi datuetara sartzen saiatu da. Oihalen irudi datuak zure ordenagailuari buruzko informazioa ezagutzeko erabil daitezkeenez, irudi datu zuria itzuli da oraingoan.
-canvas.allow=Baimendu etorkizunean
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Inoiz gune honetarako
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fa/torbutton.properties b/fa/torbutton.properties
index ca7da00..754c9cb 100644
--- a/fa/torbutton.properties
+++ b/fa/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتو
torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=وب سایت (%S) تلاش کر تا به داده عکس در یک پرده نقاشى دسترسی پیدا کند، از آنجایی که داده عکس پرده نقاشى میتواند برای کشف اطلاعات درباره رایانه شما استفاده شود، این بار داده عکس خالی بازگشت داده شد.
-canvas.allow=در آینده اجازه بده
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=برای این وبسایت، هیچگاه
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fi/torbutton.properties b/fi/torbutton.properties
index e4517fc..f6d62e7 100644
--- a/fi/torbutton.properties
+++ b/fi/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Liitännäiset, kuten Flash, voivat haitata yk
torbutton.popup.never_ask_again = Älä kysy uudelleen
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Sivu (%S) yritti päästä käsiksi canvas-elementin kuvatietoihin. Koska canvas-elementin kuvatiedoilla voidaan selvittää yksityiskohtia tietokoneestasi, lähetettiin tyhjän kuvan tiedot.
-canvas.allow=Salli jatkossa
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=S
-canvas.never=Ei koskaan tällä sivustolla
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=E
diff --git a/fil/torbutton.properties b/fil/torbutton.properties
index feb2a43..d23c67d 100644
--- a/fil/torbutton.properties
+++ b/fil/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fo/torbutton.properties b/fo/torbutton.properties
index feb2a43..d23c67d 100644
--- a/fo/torbutton.properties
+++ b/fo/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fr/torbutton.properties b/fr/torbutton.properties
index ecb71e9..6c16b44 100644
--- a/fr/torbutton.properties
+++ b/fr/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v
torbutton.popup.never_ask_again = Ne plus me poser la question.
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ce site web (%S) a essayé d’accéder aux données d’une image incluse dans un canvas. Puisque ce procédé peut être utilisé pour découvrir des informations concernant votre ordinateur, une image vide a été utilisée à la place cette fois-ci.
-canvas.allow=Autoriser à l’avenir
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Jamais pour ce site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fr_CA/torbutton.properties b/fr_CA/torbutton.properties
index fa3b890..848de2d 100644
--- a/fr_CA/torbutton.properties
+++ b/fr_CA/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Les plugiciels tels que Flash peuvent nuire à
torbutton.popup.never_ask_again = Ne plus me le demander.
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ce site Web (%S) a essayé d’accéder aux données d’une image incluse dans un canevas. Puisque les données d'images de canevas peuvent être utilisées pour découvrir des informations concernant votre ordinateur, des données d'image vides ont été retournées cette fois-ci.
-canvas.allow=Autoriser à l’avenir
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Jamais pour ce site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fur/torbutton.properties b/fur/torbutton.properties
index feb2a43..d23c67d 100644
--- a/fur/torbutton.properties
+++ b/fur/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/fy/torbutton.properties b/fy/torbutton.properties
index feb2a43..d23c67d 100644
--- a/fy/torbutton.properties
+++ b/fy/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ga/torbutton.properties b/ga/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ga/torbutton.properties
+++ b/ga/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/gl/torbutton.properties b/gl/torbutton.properties
index 90eb136..e4acb1e 100644
--- a/gl/torbutton.properties
+++ b/gl/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/gu/torbutton.properties b/gu/torbutton.properties
index ba02937..63a1bcf 100644
--- a/gu/torbutton.properties
+++ b/gu/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/gu_IN/torbutton.properties b/gu_IN/torbutton.properties
index 089f115..9190ffc 100644
--- a/gu_IN/torbutton.properties
+++ b/gu_IN/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/gun/torbutton.properties b/gun/torbutton.properties
index feb2a43..d23c67d 100644
--- a/gun/torbutton.properties
+++ b/gun/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ha/torbutton.properties b/ha/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ha/torbutton.properties
+++ b/ha/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/he/torbutton.properties b/he/torbutton.properties
index 4c256b9..3b7e438 100644
--- a/he/torbutton.properties
+++ b/he/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=אפשר בעתיד
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=לעולם לא עבור אתר זה
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/hi/torbutton.properties b/hi/torbutton.properties
index 32bde7b..cbfcc32 100644
--- a/hi/torbutton.properties
+++ b/hi/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A/अ
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index aaf8187..2138907 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=O
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/hr_HR/torbutton.properties b/hr_HR/torbutton.properties
index d0f956b..a942617 100644
--- a/hr_HR/torbutton.properties
+++ b/hr_HR/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ht/torbutton.properties b/ht/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ht/torbutton.properties
+++ b/ht/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/hu/torbutton.properties b/hu/torbutton.properties
index 7b0acef..f4c6f5f 100644
--- a/hu/torbutton.properties
+++ b/hu/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = A kiegészítők, , mint a Flash sérthetik az
torbutton.popup.never_ask_again = Ne kérdezze többé
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ez a weboldal (%S) megpróbál egy kép adatot elérni egy rétegen. Mivel a réteg kép használható a számítógép felderítésére, üres kép adat lett visszaküldve ez alkalommal.
-canvas.allow=A jövőben engedélyez
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=J
-canvas.never=Soha ennél az oldalnál
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=S
diff --git a/hy/torbutton.properties b/hy/torbutton.properties
index feb2a43..d23c67d 100644
--- a/hy/torbutton.properties
+++ b/hy/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/hy_AM/torbutton.properties b/hy_AM/torbutton.properties
index 161cb60..ad53132 100644
--- a/hy_AM/torbutton.properties
+++ b/hy_AM/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ia/torbutton.properties b/ia/torbutton.properties
index af66d77..e064b33 100644
--- a/ia/torbutton.properties
+++ b/ia/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/id/torbutton.properties b/id/torbutton.properties
index aee8133..608a9bb 100644
--- a/id/torbutton.properties
+++ b/id/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/is/torbutton.properties b/is/torbutton.properties
index 40d08a2..904f21d 100644
--- a/is/torbutton.properties
+++ b/is/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/it/torbutton.properties b/it/torbutton.properties
index c48a918..34f7671 100644
--- a/it/torbutton.properties
+++ b/it/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tu
torbutton.popup.never_ask_again = Non chiedermelo più
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Questo sito (%S) ha cercato di accedere ad un'immagine in un elemento canvas. Le immagini canvas possono essere usate per scoprire informazioni sul tuo computer, per questo è stata visualizzata un'immagine vuota.
-canvas.allow=Permetti in futuro
+canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?
+canvas.notNow=Non ora
+canvas.notNowAccessKey=N
+canvas.allow=acconsenti in futuro
canvas.allowAccessKey=A
-canvas.never=Mai per questo sito
+canvas.never=Mai per questo sito (raccomandato)
canvas.neverAccessKey=e
diff --git a/ja/torbutton.properties b/ja/torbutton.properties
index c2420ae..eda48d7 100644
--- a/ja/torbutton.properties
+++ b/ja/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたの
torbutton.popup.never_ask_again = 次からはたずねない
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=このウェブサイト (%S)はキャンバスで画像データにアクセスを試みました。 キャンバスのイメージデータはあなたのコンピュータについての情報を発見するために使われる可能性がありますので、今回は空の画像データを返しました。
-canvas.allow=後で許可する
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=このサイトには使用しない
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/jv/torbutton.properties b/jv/torbutton.properties
index feb2a43..d23c67d 100644
--- a/jv/torbutton.properties
+++ b/jv/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/kk/torbutton.properties b/kk/torbutton.properties
index feb2a43..d23c67d 100644
--- a/kk/torbutton.properties
+++ b/kk/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/km/torbutton.properties b/km/torbutton.properties
index 86b04b7..0a0f56f 100644
--- a/km/torbutton.properties
+++ b/km/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = កម្មវិធីជំនួយ
torbutton.popup.never_ask_again = កុំសួរខ្ញុំម្ដងទៀត
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=តំបន់បណ្ដាញនេះ (%S) ត្រូវបានប៉ុនប៉ងចូលដំណើរការទិន្នន័យរូបភាពលើ canvas ។ ចាប់តាំងពីទិន្នន័យរូបភាព canvas អាចត្រូវបានប្រើដើម្បីស្វែងរកព័ត៌មានអំពីកុំព្យូទ័ររបស់អ្នក, ទិន្នន័យរូបភាពទទេត្រូវបានប្ដូរទៅវិញនៅពេលនេះ។
-canvas.allow=អនុញ្ញាតនៅពេលអនាគត
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=មិនមានសម្រាប់តំបន់បណ្ដាញនេះ
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/kn/torbutton.properties b/kn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/kn/torbutton.properties
+++ b/kn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ko/torbutton.properties b/ko/torbutton.properties
index 8a452f4..c8f16d1 100644
--- a/ko/torbutton.properties
+++ b/ko/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = 플래시와 같은 플러그인들은 당신
torbutton.popup.never_ask_again = 다시는 물어보지 않기
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=이 웹사이트(%S)는 캔버스(Canvas)에 있는 이미지 데이터에 접근하려 했습니다. 캔버스 이미지 데이터는 귀하의 컴퓨터 정보를 찾아내는 데에 사용될 수 있기 때문에, 이번에 빈 이미지 데이터가 되돌려졌습니다.
-canvas.allow=나중에 허용
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=이 사이트에서는 절대 금지
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ko_KR/torbutton.properties b/ko_KR/torbutton.properties
index f6fb7a8..5bd99cf 100644
--- a/ko_KR/torbutton.properties
+++ b/ko_KR/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ku/torbutton.properties b/ku/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ku/torbutton.properties
+++ b/ku/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/kw/torbutton.properties b/kw/torbutton.properties
index feb2a43..d23c67d 100644
--- a/kw/torbutton.properties
+++ b/kw/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ky/torbutton.properties b/ky/torbutton.properties
index dc11cd7..b987a10 100644
--- a/ky/torbutton.properties
+++ b/ky/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/lb/torbutton.properties b/lb/torbutton.properties
index feb2a43..d23c67d 100644
--- a/lb/torbutton.properties
+++ b/lb/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/lg/torbutton.properties b/lg/torbutton.properties
index feb2a43..d23c67d 100644
--- a/lg/torbutton.properties
+++ b/lg/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ln/torbutton.properties b/ln/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ln/torbutton.properties
+++ b/ln/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/lo/torbutton.properties b/lo/torbutton.properties
index feb2a43..d23c67d 100644
--- a/lo/torbutton.properties
+++ b/lo/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/lt/torbutton.properties b/lt/torbutton.properties
index 8674b0f..916c0b1 100644
--- a/lt/torbutton.properties
+++ b/lt/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Leisti ateityje
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Niekada šiam puslapiui
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/lv/torbutton.properties b/lv/torbutton.properties
index 5ed5546..d737905 100644
--- a/lv/torbutton.properties
+++ b/lv/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Flash un līdzīgi spraudņi var kaitēt Jūsu
torbutton.popup.never_ask_again = Vairs nekad nevaicāt
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Tīmekļa lapa (%S) mēģināja piekļūt attēla datiem no datora fona jeb audekla. Tā ka attēla datus iespējams lietot lai noteiktu informāciju par datoru, šoreiz tika nosūtīti tukša attēla dati.
-canvas.allow=Turpmāk atļaut
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Šai vietnei nekad
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mg/torbutton.properties b/mg/torbutton.properties
index feb2a43..d23c67d 100644
--- a/mg/torbutton.properties
+++ b/mg/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mi/torbutton.properties b/mi/torbutton.properties
index feb2a43..d23c67d 100644
--- a/mi/torbutton.properties
+++ b/mi/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mk/torbutton.properties b/mk/torbutton.properties
index 9fe1031..8e3e418 100644
--- a/mk/torbutton.properties
+++ b/mk/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=Z
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ml/torbutton.properties b/ml/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ml/torbutton.properties
+++ b/ml/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mn/torbutton.properties b/mn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/mn/torbutton.properties
+++ b/mn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mr/torbutton.properties b/mr/torbutton.properties
index 2e31ee8..aea5aff 100644
--- a/mr/torbutton.properties
+++ b/mr/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = मला पुन्हा विचारू नका
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=भविष्यात परवानगी द्या
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=ह्या संकेतस्थळासाठी कधीच नाही
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ms_MY/torbutton.properties b/ms_MY/torbutton.properties
index 44f95d5..a80690f 100644
--- a/ms_MY/torbutton.properties
+++ b/ms_MY/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugin seperti Flash boleh menggangu privasi d
torbutton.popup.never_ask_again = Jangan bertanya saya lagi
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Tidak untuk Laman ini
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/mt/torbutton.properties b/mt/torbutton.properties
index feb2a43..d23c67d 100644
--- a/mt/torbutton.properties
+++ b/mt/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/my/torbutton.properties b/my/torbutton.properties
index 0a37048..b26711c 100644
--- a/my/torbutton.properties
+++ b/my/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nah/torbutton.properties b/nah/torbutton.properties
index feb2a43..d23c67d 100644
--- a/nah/torbutton.properties
+++ b/nah/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nap/torbutton.properties b/nap/torbutton.properties
index feb2a43..d23c67d 100644
--- a/nap/torbutton.properties
+++ b/nap/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nb/torbutton.properties b/nb/torbutton.properties
index eb46bfb..d2362c6 100644
--- a/nb/torbutton.properties
+++ b/nb/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade per
torbutton.popup.never_ask_again = Ikke spør meg igjen
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Denne nettsiden (%S) forsøkte å få tilgang til bildedata på et lerret. Siden bildedata på lerret kan bli brukt til å avlsøre informasjon om datamaskinen din, ble blank bildedata returnert denne gangen.
-canvas.allow=Tillat i framtiden
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Aldri på denne siden
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nds/torbutton.properties b/nds/torbutton.properties
index feb2a43..d23c67d 100644
--- a/nds/torbutton.properties
+++ b/nds/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ne/torbutton.properties b/ne/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ne/torbutton.properties
+++ b/ne/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nl/torbutton.properties b/nl/torbutton.properties
index 6fc64a8..d686d80 100644
--- a/nl/torbutton.properties
+++ b/nl/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni
torbutton.popup.never_ask_again = Vraag me dit nooit meer.
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Deze website (%S) probeerde image data op een canvas te benaderen. Aangezien canvas image data gebruikt kan worden om informatie te verkrijgen over je computer, is deze keer blanco image data teruggemeld.
-canvas.allow=Toestaan in de toekomst
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Nooit voor deze site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nl_BE/torbutton.properties b/nl_BE/torbutton.properties
index feb2a43..d23c67d 100644
--- a/nl_BE/torbutton.properties
+++ b/nl_BE/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nn/torbutton.properties b/nn/torbutton.properties
index 8a36477..398a748 100644
--- a/nn/torbutton.properties
+++ b/nn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Aldri for denne sida
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/nso/torbutton.properties b/nso/torbutton.properties
index feb2a43..d23c67d 100644
--- a/nso/torbutton.properties
+++ b/nso/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/oc/torbutton.properties b/oc/torbutton.properties
index feb2a43..d23c67d 100644
--- a/oc/torbutton.properties
+++ b/oc/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/or/torbutton.properties b/or/torbutton.properties
index feb2a43..d23c67d 100644
--- a/or/torbutton.properties
+++ b/or/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/pa/torbutton.properties b/pa/torbutton.properties
index 7d3ddb2..f923a45 100644
--- a/pa/torbutton.properties
+++ b/pa/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/pap/torbutton.properties b/pap/torbutton.properties
index feb2a43..d23c67d 100644
--- a/pap/torbutton.properties
+++ b/pap/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/pl/torbutton.properties b/pl/torbutton.properties
index 8798190..2b5524f 100644
--- a/pl/torbutton.properties
+++ b/pl/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogą szkodzić Twojej
torbutton.popup.never_ask_again = Nie pytaj mnie więcej
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ta strona (%S) próbowała dostać się do danych obrazu na canvas. Jako że te dane mogą być użyte do odkrycia informacji o Twoim komputerze, na razie został zwrócony pusty obraz.
-canvas.allow=Pozwól w przyszłości
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=P
-canvas.never=Nigdy dla tej strony
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=i
diff --git a/pms/torbutton.properties b/pms/torbutton.properties
index feb2a43..d23c67d 100644
--- a/pms/torbutton.properties
+++ b/pms/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ps/torbutton.properties b/ps/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ps/torbutton.properties
+++ b/ps/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/pt/torbutton.properties b/pt/torbutton.properties
index fc4ce58..6ebe658 100644
--- a/pt/torbutton.properties
+++ b/pt/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Esta página (%S) tentou aceder a dados de imagem em tela. Porque os dados de imagem em tela podem ser usados para revelar informação acerca do seu computador, neste momento foram devolvidos dados de imagem em branco.
-canvas.allow=Permitir no futuro
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Nunca para ESTE SITE
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties
index c06cfd5..df9ffa2 100644
--- a/pt_BR/torbutton.properties
+++ b/pt_BR/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua priv
torbutton.popup.never_ask_again = Não me pergunte novamente
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Este website (%S) tentou acessar dados de imagem em um canvas. Como os dados de imagem dos canvas podem ser usados para descobrir informações sobre seu computador, dados de imagem em branco foram retornados neste momento.
-canvas.allow=Permitir no Futuro
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=Um
-canvas.never=Nunca para este site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ro/torbutton.properties b/ro/torbutton.properties
index 11cc496..2b74fc2 100644
--- a/ro/torbutton.properties
+++ b/ro/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugin-urile cum ar fi "Flash" iti poate afect
torbutton.popup.never_ask_again = Nu mai intreba din nou
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Permiteti in viitor.
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Niciodata pentru acest site.
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ru/torbutton.properties b/ru/torbutton.properties
index f0f294d..5339ed1 100644
--- a/ru/torbutton.properties
+++ b/ru/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Плагины вроде Flash могут н
torbutton.popup.never_ask_again = Больше не спрашивать
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Этот веб-сайт (% S) пытался получить доступ к данным изображения на холсте. Поскольку данные холсте изображение может быть использовано для получения информации о вашем компьютере, пустые данные изображения были возвращены на этот раз.
-canvas.allow=Позволит в будущем
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Никогда для этого сайта
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ru(a)petr1708/torbutton.properties b/ru(a)petr1708/torbutton.properties
index 67391fe..d595aaa 100644
--- a/ru(a)petr1708/torbutton.properties
+++ b/ru(a)petr1708/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=О
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/scn/torbutton.properties b/scn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/scn/torbutton.properties
+++ b/scn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sco/torbutton.properties b/sco/torbutton.properties
index feb2a43..d23c67d 100644
--- a/sco/torbutton.properties
+++ b/sco/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/si_LK/torbutton.properties b/si_LK/torbutton.properties
index 1172704..ecf57f7 100644
--- a/si_LK/torbutton.properties
+++ b/si_LK/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = ඔබගේ පෞද්ගලිකතාව
torbutton.popup.never_ask_again = මගෙන් තවත් කිසිවිටක නොඅසන්න
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=මෙම වෙබ් අඩවිය(%S) කැන්වසය මත ඇති ඡායාරුප දත්ත ප්රවේශනයට උත්සාහ ගෙන ඇත. මෙම කැන්වස් ඡායාරුප දත්ත ඔබගේ පරිගණකයේ දත්ත සොයාගැනීමට හැකි බැවින් මෙවර හිස් ඡායාරුප දත්ත මුදාහරින ලදී.
-canvas.allow=අනාගතයේදී ඉඩ දෙනු ඇත
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=මෙම පිටුව සදහා කිසිදාක එපා
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sk/torbutton.properties b/sk/torbutton.properties
index 9aa0d27..182f327 100644
--- a/sk/torbutton.properties
+++ b/sk/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sk_SK/torbutton.properties b/sk_SK/torbutton.properties
index ee15c36..5e94cbe 100644
--- a/sk_SK/torbutton.properties
+++ b/sk_SK/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Prípojné moduly, napr. Flash, môžu naruši
torbutton.popup.never_ask_again = Už sa viac nepýtať
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Stránka (%S) sa pokúsila o prístup k obrázku na plátne canvas. Keďže údaje z plátna môžu byť použité na odhalenie informácií o vašom počítači, boli tentokrát odoslané prázdne údaje.
-canvas.allow=Povoliť v budúcnosti
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Nikdy pre túto stránku
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sl/torbutton.properties b/sl/torbutton.properties
index e385d41..0f456d6 100644
--- a/sl/torbutton.properties
+++ b/sl/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties
index feb2a43..d23c67d 100644
--- a/sl_SI/torbutton.properties
+++ b/sl_SI/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sn/torbutton.properties b/sn/torbutton.properties
index feb2a43..d23c67d 100644
--- a/sn/torbutton.properties
+++ b/sn/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/so/torbutton.properties b/so/torbutton.properties
index feb2a43..d23c67d 100644
--- a/so/torbutton.properties
+++ b/so/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/son/torbutton.properties b/son/torbutton.properties
index feb2a43..d23c67d 100644
--- a/son/torbutton.properties
+++ b/son/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sq/torbutton.properties b/sq/torbutton.properties
index 542139d..49fcd73 100644
--- a/sq/torbutton.properties
+++ b/sq/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sr/torbutton.properties b/sr/torbutton.properties
index b8974c5..ced108f 100644
--- a/sr/torbutton.properties
+++ b/sr/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Dodatci kao sto je Flash mogu biti stetni za v
torbutton.popup.never_ask_again = Ne pitaj me vise
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ova stranica (%S) je pokusala da pristupi podatcima grafike na kanvasu. Posto kanvas podaci mogu da se koriste da se odkriju informacije o vasem racunaru, blanko grafika je koriscena.
-canvas.allow=Dozvoli u buducnosti
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=
-canvas.never=Nikad za ovaj sajt
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sr(a)latin/torbutton.properties b/sr(a)latin/torbutton.properties
index 7e00743..aff029f 100644
--- a/sr(a)latin/torbutton.properties
+++ b/sr(a)latin/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Nikad me ne pitaj ponovo
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Ubuduće dopuštaj
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Novije za ovaj sajt
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/st/torbutton.properties b/st/torbutton.properties
index feb2a43..d23c67d 100644
--- a/st/torbutton.properties
+++ b/st/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/su/torbutton.properties b/su/torbutton.properties
index feb2a43..d23c67d 100644
--- a/su/torbutton.properties
+++ b/su/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sv/torbutton.properties b/sv/torbutton.properties
index a08b3de..aab3f2f 100644
--- a/sv/torbutton.properties
+++ b/sv/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra di
torbutton.popup.never_ask_again = Fråga aldrig igen
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Denna webbsida (%S) försökte komma åt bild data på ett kanvas. Eftersom kanvas bild data kan användas för att upptäcka information om din dator skickades vi tom bild data denna gång.
-canvas.allow=Tillåt i Framtiden
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Aldrig för Denna Sida
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/sw/torbutton.properties b/sw/torbutton.properties
index feb2a43..d23c67d 100644
--- a/sw/torbutton.properties
+++ b/sw/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/szl/torbutton.properties b/szl/torbutton.properties
index feb2a43..d23c67d 100644
--- a/szl/torbutton.properties
+++ b/szl/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ta/torbutton.properties b/ta/torbutton.properties
index 5c4ac0e..f53e190 100644
--- a/ta/torbutton.properties
+++ b/ta/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/te/torbutton.properties b/te/torbutton.properties
index feb2a43..d23c67d 100644
--- a/te/torbutton.properties
+++ b/te/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/te_IN/torbutton.properties b/te_IN/torbutton.properties
index feb2a43..d23c67d 100644
--- a/te_IN/torbutton.properties
+++ b/te_IN/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/tg/torbutton.properties b/tg/torbutton.properties
index feb2a43..d23c67d 100644
--- a/tg/torbutton.properties
+++ b/tg/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/th/torbutton.properties b/th/torbutton.properties
index 493be4f..7a27c6d 100644
--- a/th/torbutton.properties
+++ b/th/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ti/torbutton.properties b/ti/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ti/torbutton.properties
+++ b/ti/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/tk/torbutton.properties b/tk/torbutton.properties
index feb2a43..d23c67d 100644
--- a/tk/torbutton.properties
+++ b/tk/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index 5855f79..d57e81f 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonim
torbutton.popup.never_ask_again = Bir daha sorma
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Bu web sitesi (%S) canvas'daki resim verisini erişmeye çalıştı. Canvas resim verisi bilgisayarınız hakkında bilgi almak için kullanılabileceğinden bu sefer boş resim verisi gönderildi.
-canvas.allow=Gelecekte izin ver
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=H
-canvas.never=Bu site için asla
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=a
diff --git a/uk/torbutton.properties b/uk/torbutton.properties
index b09d744..00fc544 100644
--- a/uk/torbutton.properties
+++ b/uk/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Плагіни, такі як Flash, можу
torbutton.popup.never_ask_again = Більше ніколи не запитувати
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Цей веб-сайт (%S) намагався отримати доступ до даних зображення на полотні. Оскільки дані зображення полотна не можуть бути використані для отримання інформації про ваш комп'ютер, порожні дані зображення були повернуті на цей раз.
-canvas.allow=Дозволить у майбутньому
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=А
-canvas.never=Ніколи для цього сайту
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=е
diff --git a/ur/torbutton.properties b/ur/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ur/torbutton.properties
+++ b/ur/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ur_PK/torbutton.properties b/ur_PK/torbutton.properties
index 1e1b326..6296bf3 100644
--- a/ur_PK/torbutton.properties
+++ b/ur_PK/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/uz/torbutton.properties b/uz/torbutton.properties
index 02784a3..88dca76 100644
--- a/uz/torbutton.properties
+++ b/uz/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Ushbu sahifa uchun hech qachon
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/ve/torbutton.properties b/ve/torbutton.properties
index feb2a43..d23c67d 100644
--- a/ve/torbutton.properties
+++ b/ve/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/vi/torbutton.properties b/vi/torbutton.properties
index d500589..20b1f61 100644
--- a/vi/torbutton.properties
+++ b/vi/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=T
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/wa/torbutton.properties b/wa/torbutton.properties
index feb2a43..d23c67d 100644
--- a/wa/torbutton.properties
+++ b/wa/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/wo/torbutton.properties b/wo/torbutton.properties
index feb2a43..d23c67d 100644
--- a/wo/torbutton.properties
+++ b/wo/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index cb46ace..e1939c6 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与
torbutton.popup.never_ask_again = 不再询问
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=此网站(%S)试图访问画布上的图像数据。因为画布上的数据可以被用来侦测您的电脑信息,所以 Torbutton 这次返回了空白图像数据。
-canvas.allow=以后允许
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=禁止此站点
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/zh_HK/torbutton.properties b/zh_HK/torbutton.properties
index ea5a15a..3aa05cc 100644
--- a/zh_HK/torbutton.properties
+++ b/zh_HK/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties
index 2a6170f..46e2710 100644
--- a/zh_TW/torbutton.properties
+++ b/zh_TW/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = 如 Flash 的外掛程式可能會危害您的
torbutton.popup.never_ask_again = 不要再問我
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=本網站(%S)試圖存取畫布上的圖像資料。由於畫布上的圖像資料可以用來探索您電腦的相關資訊,此時傳回空白圖像資料。
-canvas.allow=未來允許
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=從不為此網站
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
diff --git a/zu/torbutton.properties b/zu/torbutton.properties
index feb2a43..d23c67d 100644
--- a/zu/torbutton.properties
+++ b/zu/torbutton.properties
@@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Not Now
+canvas.notNowAccessKey=N
+canvas.allow=Allow in the future
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Never for this site (recommended)
canvas.neverAccessKey=e
1
0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry@torproject.org 20 Aug '14
by mikeperry@torproject.org 20 Aug '14
20 Aug '14
commit e3d04fb74ac49a2e3f4d074d0e3ea6edec77b8c3
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sun Aug 17 01:31:03 2014 +0000
fixup! Add canvas image extraction prompt.
Modify Pearl Crescent's #7265 patch to log all HTML5 canvas access attempts.
---
content/canvas/src/CanvasUtils.cpp | 42 ++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 7 deletions(-)
diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp
index 203dd92..f2f4536 100644
--- a/content/canvas/src/CanvasUtils.cpp
+++ b/content/canvas/src/CanvasUtils.cpp
@@ -33,6 +33,8 @@ using namespace mozilla::gfx;
#include "mozIThirdPartyUtil.h"
#include "nsContentUtils.h"
#include "nsUnicharUtils.h"
+#include "nsPrintfCString.h"
+#include "nsIConsoleService.h"
#define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt"
#define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData"
@@ -79,14 +81,40 @@ IsImageExtractionAllowed(nsIDocument *aDocument)
isAllowed = (permission == nsIPermissionManager::ALLOW_ACTION);
if (!isAllowed && (permission != nsIPermissionManager::DENY_ACTION)) {
- // Send notification so that a prompt is displayed.
- nsCString spec;
- rv = uri->GetSpec(spec);
+ // Log all attempted canvas access and block access by third parties.
+ bool isThirdParty = true;
+ nsIURI *docURI = aDocument->GetDocumentURI();
+ rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty);
+ NS_ENSURE_SUCCESS(rv, false);
+
+ nsCString firstPartySpec;
+ rv = uri->GetSpec(firstPartySpec);
+ nsCString docSpec;
+ docURI->GetSpec(docSpec);
+ nsPrintfCString msg("On %s: blocked access to canvas image data"
+ " from %s ", // L10n
+ firstPartySpec.get(), docSpec.get());
+
+ nsCOMPtr<nsIConsoleService> console
+ (do_GetService(NS_CONSOLESERVICE_CONTRACTID));
+ if (console)
+ console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get());
+
+ // Log every canvas access attempt to stdout if debugging:
+#ifdef DEBUG
+ printf("%s\n", msg.get());
+#endif
+ // Ensure URI is valid after logging, but before trying to notify the
+ // user:
NS_ENSURE_SUCCESS(rv, false);
- nsCOMPtr<nsIObserverService> obs =
- mozilla::services::GetObserverService();
- obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT,
- NS_ConvertUTF8toUTF16(spec).get());
+
+ if (!isThirdParty) {
+ // Send notification so that a prompt is displayed.
+ nsCOMPtr<nsIObserverService> obs =
+ mozilla::services::GetObserverService();
+ obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT,
+ NS_ConvertUTF8toUTF16(firstPartySpec).get());
+ }
}
}
}
1
0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry@torproject.org 20 Aug '14
by mikeperry@torproject.org 20 Aug '14
20 Aug '14
commit 6048d4da85bd89f810f102517102ca27821bab21
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue Aug 19 20:34:23 2014 -0700
fixup! Add canvas image extraction prompt.
Use JSContext to get URL information for HTML5 canvas access.
---
content/canvas/src/CanvasRenderingContext2D.cpp | 2 +-
content/canvas/src/CanvasUtils.cpp | 18 +++++++++++++-----
content/canvas/src/CanvasUtils.h | 2 +-
content/html/content/src/HTMLCanvasElement.cpp | 9 +++++----
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index 9be4ced..c53ac07 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -3506,7 +3506,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
if (mCanvasElement) {
nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc();
usePlaceholder = !ownerDoc ||
- !CanvasUtils::IsImageExtractionAllowed(ownerDoc);
+ !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx);
}
if (usePlaceholder) {
diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp
index f2f4536..591650a 100644
--- a/content/canvas/src/CanvasUtils.cpp
+++ b/content/canvas/src/CanvasUtils.cpp
@@ -35,6 +35,7 @@ using namespace mozilla::gfx;
#include "nsUnicharUtils.h"
#include "nsPrintfCString.h"
#include "nsIConsoleService.h"
+#include "jsdbgapi.h"
#define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt"
#define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData"
@@ -43,10 +44,9 @@ namespace mozilla {
namespace CanvasUtils {
// Check site-specific permission and display prompt if appropriate.
-bool
-IsImageExtractionAllowed(nsIDocument *aDocument)
+bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx)
{
- if (!aDocument)
+ if (!aDocument || !aCx)
return false;
nsPIDOMWindow *win = aDocument->GetWindow();
@@ -87,13 +87,21 @@ IsImageExtractionAllowed(nsIDocument *aDocument)
rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty);
NS_ENSURE_SUCCESS(rv, false);
+ nsCString scriptFile("unknown");
+ unsigned scriptLine = 0;
+ JSScript *script;
+ if (JS_DescribeScriptedCaller(aCx, &script, &scriptLine)) {
+ scriptFile = JS_GetScriptFilename(aCx, script);
+ }
+
nsCString firstPartySpec;
rv = uri->GetSpec(firstPartySpec);
nsCString docSpec;
docURI->GetSpec(docSpec);
nsPrintfCString msg("On %s: blocked access to canvas image data"
- " from %s ", // L10n
- firstPartySpec.get(), docSpec.get());
+ " from document %s, script from %s:%u ", // L10n
+ firstPartySpec.get(), docSpec.get(),
+ scriptFile.get(), scriptLine);
nsCOMPtr<nsIConsoleService> console
(do_GetService(NS_CONSOLESERVICE_CONTRACTID));
diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h
index d7aae4d..1e7f726 100644
--- a/content/canvas/src/CanvasUtils.h
+++ b/content/canvas/src/CanvasUtils.h
@@ -45,7 +45,7 @@ void DoDrawImageSecurityCheck(dom::HTMLCanvasElement *aCanvasElement,
bool forceWriteOnly,
bool CORSUsed);
-bool IsImageExtractionAllowed(nsIDocument *aDocument);
+bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx);
// Make a double out of |v|, treating undefined values as 0.0 (for
// the sake of sparse arrays). Return true iff coercion
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
index e229e1c..d6cb88a 100644
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@@ -355,7 +355,7 @@ HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams,
// Check site-specific permission and display prompt if appropriate.
// If no permission, return all-white, opaque image data.
- bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc());
+ bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx);
return ToDataURLImpl(aCx, aType, aParams, usePlaceholder, aDataURL);
}
@@ -590,10 +590,11 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback,
}
bool fallbackToPNG = false;
+ JSContext* cx = nsContentUtils::GetCurrentJSContext();
// Check site-specific permission and display prompt if appropriate.
// If no permission, return all-white, opaque image data.
- bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc());
+ bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), cx);
nsCOMPtr<nsIInputStream> stream;
rv = ExtractData(type, EmptyString(), usePlaceholder,
getter_AddRefs(stream), fallbackToPNG);
@@ -616,7 +617,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback,
nsRefPtr<nsDOMMemoryFile> blob =
new nsDOMMemoryFile(imgData, imgSize, type);
- JSContext* cx = nsContentUtils::GetCurrentJSContext();
if (cx) {
JS_updateMallocCounter(cx, imgSize);
}
@@ -648,7 +648,8 @@ HTMLCanvasElement::MozGetAsFile(const nsAString& aName,
// Check site-speciifc permission and display prompt if appropriate.
// If no permission, return all-white, opaque image data.
- bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc());
+ bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(),
+ nsContentUtils::GetCurrentJSContext());
return MozGetAsFileImpl(aName, aType, usePlaceholder, aResult);
}
1
0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry@torproject.org 20 Aug '14
by mikeperry@torproject.org 20 Aug '14
20 Aug '14
commit 5c54c75b5ea3ab1373a530d05f8fc40211d9065e
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Tue Jul 29 06:04:57 2014 +0000
fixup! Add canvas image extraction prompt.
Bug #12684: Make "Not now" default for HTML5 canvas permission dialogue.
This alters the `PopupNotification`s [0] which notify users that a
website has attempted to access an HTML5 canvas. The new default
ordering for buttons is:
Not Now
Never for this site (recommended)
Allow in the future
* FIXES #12684 [1] by making "Not Now" the default in the HTML5 canvas
fingerprinting permissions dialogue.
* ADDS palette icons for HTML5 canvas permissions PopupNotification UI.
The image is freely licensed and obtainable from:
https://openclipart.org/image/300px/svg_to_png/21620/ben_palette.png
* ADDS a CSS whitespace hack from Pearl Crescent to the
`CanvasPermissionPromptHelper_init()` function in
`browser/base/content/browser.js` for causing the newlines in the
`canvas.siteprompt` string (in torbutton.git, in
`chrome/locale/en/torbutton.properties`) to render correctly in
PopupNotification XUL <description> elements. [2]
NOTE: Applying this patch requires an additional patch to TorButton, to
store the additional UI strings before localisation. [3]
[0]: https://mxr.mozilla.org/mozilla-esr24/source/toolkit/modules/PopupNotificat…
[1]: https://bugs.torproject.org/12684
[2]: https://trac.torproject.org/projects/tor/ticket/12684#comment:21
[3]: https://github.com/isislovecruft/torbutton/commit/368e74d62df349b27cf578525…
---
browser/base/content/browser.js | 19 ++++++++++++++++---
browser/themes/linux/browser.css | 10 ++++++++--
browser/themes/linux/canvas-popup.svg | 19 +++++++++++++++++++
browser/themes/linux/jar.mn | 1 +
browser/themes/osx/browser.css | 10 ++++++++--
browser/themes/osx/canvas-popup.svg | 19 +++++++++++++++++++
browser/themes/osx/jar.mn | 1 +
browser/themes/windows/browser.css | 10 ++++++++--
browser/themes/windows/canvas-popup.svg | 19 +++++++++++++++++++
browser/themes/windows/jar.mn | 1 +
10 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1df295a..b4da3f6 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6034,6 +6034,12 @@ var CanvasPermissionPromptHelper = {
init:
function CanvasPermissionPromptHelper_init() {
+ if (document.styleSheets && (document.styleSheets.length > 0)) try {
+ let ruleText = "panel[popupid=canvas-permissions-prompt] description { white-space: pre-wrap; }";
+ let sheet = document.styleSheets[0];
+ sheet.insertRule(ruleText, sheet.cssRules.length);
+ } catch (e) {};
+
Services.obs.addObserver(this, this._permissionsPrompt, false);
},
@@ -6077,10 +6083,10 @@ var CanvasPermissionPromptHelper = {
var message = getLocalizedString("canvas.siteprompt", [ uri.asciiHost ]);
var mainAction = {
- label: getLocalizedString("canvas.allow"),
- accessKey: getLocalizedString("canvas.allowAccessKey"),
+ label: getLocalizedString("canvas.notNow"),
+ accessKey: getLocalizedString("canvas.notNowAccessKey"),
callback: function() {
- setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION);
+ return null;
}
};
@@ -6091,6 +6097,13 @@ var CanvasPermissionPromptHelper = {
callback: function() {
setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION);
}
+ },
+ {
+ label: getLocalizedString("canvas.allow"),
+ accessKey: getLocalizedString("canvas.allowAccessKey"),
+ callback: function() {
+ setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION);
+ }
}
];
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 9395669..a47ea4e 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1207,7 +1207,10 @@ toolbar[iconsize="small"] #webrtc-status-button {
list-style-image: url("moz-icon://stock/gtk-cancel?size=menu");
}
-.popup-notification-icon[popupid="canvas-permissions-prompt"],
+.popup-notification-icon[popupid="canvas-permissions-prompt"] {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
.popup-notification-icon[popupid="indexedDB-quota-prompt"],
.popup-notification-icon[popupid*="offline-app-requested"],
@@ -1291,7 +1294,10 @@ toolbar[iconsize="small"] #webrtc-status-button {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
}
-#canvas-notification-icon,
+#canvas-notification-icon {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.indexedDB-notification-icon,
#indexedDB-notification-icon {
list-style-image: url(chrome://global/skin/icons/question-16.png);
diff --git a/browser/themes/linux/canvas-popup.svg b/browser/themes/linux/canvas-popup.svg
new file mode 100644
index 0000000..f99eac3
--- /dev/null
+++ b/browser/themes/linux/canvas-popup.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
+
+ <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata>
+ <g>
+ <title>Layer 1</title>
+ <g id="layer1">
+ <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/>
+ <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820">
+ <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/>
+ <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index b4eaf14..4d1892d 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -231,6 +231,7 @@ browser.jar:
skin/classic/browser/syncQuota.css
skin/classic/browser/syncProgress.css
#endif
+ skin/classic/browser/canvas-popup.svg
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-64.png
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 4166ed0..085a1da 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3103,7 +3103,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
-moz-margin-start: 0; /* override default label margin to match description margin */
}
-#canvas-notification-icon,
+#canvas-notification-icon {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.indexedDB-notification-icon,
#indexedDB-notification-icon {
list-style-image: url(chrome://global/skin/icons/question-16.png);
@@ -3375,7 +3378,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-.popup-notification-icon[popupid="canvas-permissions-prompt"],
+.popup-notification-icon[popupid="canvas-permissions-prompt"] {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
.popup-notification-icon[popupid="indexedDB-quota-prompt"],
.popup-notification-icon[popupid*="offline-app-requested"],
diff --git a/browser/themes/osx/canvas-popup.svg b/browser/themes/osx/canvas-popup.svg
new file mode 100644
index 0000000..f99eac3
--- /dev/null
+++ b/browser/themes/osx/canvas-popup.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
+
+ <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata>
+ <g>
+ <title>Layer 1</title>
+ <g id="layer1">
+ <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/>
+ <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820">
+ <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/>
+ <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 8295008..de119b1 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -329,6 +329,7 @@ browser.jar:
skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon(a)2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion(a)2x.png)
skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png)
skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png)
+ skin/classic/browser/canvas-popup.svg
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-16(a)2x.png
skin/classic/browser/webapps-64.png
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index edb064c..7012c41 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2449,7 +2449,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-.popup-notification-icon[popupid="canvas-permissions-prompt"],
+.popup-notification-icon[popupid="canvas-permissions-prompt"] {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
.popup-notification-icon[popupid="indexedDB-quota-prompt"],
.popup-notification-icon[popupid*="offline-app-requested"],
@@ -2531,7 +2534,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
}
-#canvas-notification-icon,
+#canvas-notification-icon {
+ list-style-image: url(chrome://browser/skin/canvas-popup.svg);
+}
+
.indexedDB-notification-icon,
#indexedDB-notification-icon {
list-style-image: url(chrome://global/skin/icons/question-16.png);
diff --git a/browser/themes/windows/canvas-popup.svg b/browser/themes/windows/canvas-popup.svg
new file mode 100644
index 0000000..f99eac3
--- /dev/null
+++ b/browser/themes/windows/canvas-popup.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
+
+ <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata>
+ <g>
+ <title>Layer 1</title>
+ <g id="layer1">
+ <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/>
+ <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820">
+ <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/>
+ <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index eff2220..b9cf33a 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -69,6 +69,7 @@ browser.jar:
skin/classic/browser/urlbar-arrow.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-history-dropmarker.png
+ skin/classic/browser/canvas-popup.svg
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-64.png
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
1
0