[or-cvs] r12407: Since a Firefox crash leaves Torbutton in a non-deterministi (in torbutton/trunk/src/chrome: content locale/de-AT locale/de-CH locale/de-DE locale/el-GR locale/en-US locale/es-AR locale/fr-FR locale/hr-HR locale/it-IT locale/nl-NL locale/pl-PL locale/pt-BR locale/ru-RU locale/sl-SI locale/zh-CN locale/zh-TW)
mikeperry at seul.org
mikeperry at seul.org
Wed Nov 7 08:56:59 UTC 2007
Author: mikeperry
Date: 2007-11-07 03:56:58 -0500 (Wed, 07 Nov 2007)
New Revision: 12407
Modified:
torbutton/trunk/src/chrome/content/preferences.js
torbutton/trunk/src/chrome/content/preferences.xul
torbutton/trunk/src/chrome/content/torbutton.js
torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
Log:
Since a Firefox crash leaves Torbutton in a non-deterministic
state, have user to choose to always restore via either Tor or
Non-Tor.
Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/content/preferences.js 2007-11-07 08:56:58 UTC (rev 12407)
@@ -186,8 +186,16 @@
= doc.getElementById('torbutton_allShutdown');
}
+ if(o_torprefs.getBoolPref('restore_tor')) {
+ doc.getElementById('torbutton_restoreTorGroup').selectedItem =
+ doc.getElementById('torbutton_restoreTor');
+ } else {
+ doc.getElementById('torbutton_restoreTorGroup').selectedItem =
+ doc.getElementById('torbutton_restoreNonTor');
+ }
+
doc.getElementById('torbutton_noTorSessionStore').checked = o_torprefs.getBoolPref('notor_sessionstore');
- doc.getElementById('torbutton_restoreTor').checked = o_torprefs.getBoolPref('restore_tor');
+
doc.getElementById('torbutton_reloadCrashedJar').checked = o_torprefs.getBoolPref('reload_crashed_jar');
doc.getElementById('torbutton_blockTorHRead').checked = o_torprefs.getBoolPref('block_thread');
doc.getElementById('torbutton_blockTorHWrite').checked = o_torprefs.getBoolPref('block_thwrite');
@@ -270,9 +278,13 @@
doc.getElementById('torbutton_shutdownGroup').selectedItem
= doc.getElementById('torbutton_noShutdown');
}
+
+ o_torprefs.setBoolPref('restore_tor',
+ doc.getElementById('torbutton_restoreTorGroup').selectedItem ==
+ doc.getElementById('torbutton_restoreTor'));
+
o_torprefs.setBoolPref('notor_sessionstore', doc.getElementById('torbutton_noTorSessionStore').checked);
- o_torprefs.setBoolPref('restore_tor', doc.getElementById('torbutton_restoreTor').checked);
o_torprefs.setBoolPref('reload_crashed_jar', doc.getElementById('torbutton_reloadCrashedJar').checked);
o_torprefs.setBoolPref('block_thread', doc.getElementById('torbutton_blockTorHRead').checked);
o_torprefs.setBoolPref('block_thwrite', doc.getElementById('torbutton_blockTorHWrite').checked);
Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/content/preferences.xul 2007-11-07 08:56:58 UTC (rev 12407)
@@ -210,10 +210,20 @@
</radiogroup>
<checkbox id="torbutton_reloadCrashedJar" label="&torbutton.prefs.reload_crashed_jar;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
+
<checkbox id="torbutton_noTorSessionStore" label="&torbutton.prefs.notor_sessionstore;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
- <checkbox id="torbutton_restoreTor" label="&torbutton.prefs.restore_tor;"
+ <hbox align="center" flex="1">
+ <label align="center" value="&torbutton.prefs.restore_tor;" control="torbutton_restoreTorGroup"/>
+ <radiogroup align="center" orient="horizontal" id="torbutton_restoreTorGroup">
+ <radio id="torbutton_restoreTor"
+ label="&torbutton.prefs.tor;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <radio id="torbutton_restoreNonTor"
+ label="&torbutton.prefs.non_tor;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ </radiogroup>
+ </hbox>
</vbox>
</tabpanel>
<tabpanel id="headers">
Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/content/torbutton.js 2007-11-07 08:56:58 UTC (rev 12407)
@@ -862,6 +862,8 @@
torbutton_restore_cookies();
if(m_tb_prefs.getBoolPref("extensions.torbutton.restore_tor"))
torbutton_conditional_set(true);
+ else
+ torbutton_conditional_set(false);
m_tb_prefs.setBoolPref("extensions.torbutton.crashed", false);
}
torbutton_log(3, "End crash recover check");
Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2007-11-07 07:38:51 UTC (rev 12406)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2007-11-07 08:56:58 UTC (rev 12407)
@@ -63,6 +63,6 @@
<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor-loaded tabs (recommended)">
<!ENTITY torbutton.prefs.tor "Tor">
<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Restore saved session via Tor after Firefox crash (optional)">
+<!ENTITY torbutton.prefs.restore_tor "After a crash, restore saved session via:">
<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
More information about the tor-commits
mailing list