[or-cvs] r14890: Bump version. Add FF3 warning. (in torbutton/trunk/src: . chrome/content chrome/locale/ar chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW defaults/preferences)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2008-06-02 02:18:17 -0400 (Mon, 02 Jun 2008)
New Revision: 14890

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/chrome/locale/ar/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties
   torbutton/trunk/src/chrome/locale/en-US/torbutton.properties
   torbutton/trunk/src/chrome/locale/es/torbutton.properties
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
   torbutton/trunk/src/chrome/locale/ru/torbutton.properties
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties
   torbutton/trunk/src/defaults/preferences/preferences.js
   torbutton/trunk/src/install.rdf
Log:

Bump version. Add FF3 warning.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-06-02 06:18:17 UTC (rev 14890)
@@ -546,6 +546,20 @@
     // history/cookie clearing
     if(!changed && !force_update) return;
 
+    if(m_tb_ff3 
+            && !m_tb_prefs.getBoolPref("extensions.torbutton.warned_ff3")
+            && mode && changed) {
+        var o_stringbundle = torbutton_get_stringbundle();
+        var warning = o_stringbundle.GetStringFromName("torbutton.popup.ff3.warning");
+        var ret = window.confirm(warning);
+
+        if(!ret) {
+            torbutton_disable_tor();
+            return;
+        }
+        m_tb_prefs.setBoolPref("extensions.torbutton.warned_ff3", true);
+    }
+
     torbutton_log(2, 'Setting user agent');
     
     if(torprefs.getBoolPref("set_uagent")) {

Modified: torbutton/trunk/src/chrome/locale/ar/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/ar/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/ar/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -10,3 +10,4 @@
 torbutton.popup.history.warning = منع توربتن تعديل الحالة-المتغيرة للتأريخ.\n\nطالع تضبيطات التأريخ لتسمح بهذا.\n\n
 torbutton.popup.plugin.warning = منع توربتن تحميلا مباشرا لمحتوى ملحقة.\n\nاستخدم 'احفظ باسم' بدلا عن هذا.\n\n
 
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης του Firefox στον διαμεσολαβητή Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -10,3 +10,4 @@
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/es/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/es/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/es/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Torbutton provee un botón para activar y desactivar el proxy Tor de manera fácil.
 torbutton.popup.history.warning = Torbutton bloqueó un intento de manipulación del Historial.\n\nVea las preferencias del Historial para permitirlo.\n\n
 torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa de un plugin.\n\nUse Guardar como.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -9,3 +9,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton comporte un bouton qui permet d'activer et de désactiver rapidement le pointage de Firefox vers le proxy de Tor.
 torbutton.popup.history.warning = Torbutton a bloqué la manipulation de l'historique des modifications.\n\nVoir les paramètres de l'historique pour permettre la manipulation.\n\n
 torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor de contenu de plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -9,3 +9,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=L'estensione mette a disposizione un pulsante per attivare e disattivare facilmente il proxy Tor
 torbutton.popup.history.warning=Torbutton ha bloccato la modifica della cronologia quando cambia stato.\n\nVai alle impostazioni della cronologia per permetterlo.\n\n
 torbutton.popup.plugin.warning=Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/ru/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Кнопка включения/отключения доступа к Интернет через сеть Tor
 torbutton.popup.history.warning = Torbutton заблокировал операции с журналом.\n\nСм. настройки журнала.\n\n
 torbutton.popup.plugin.warning = Torbutton заблокировал прямую установку  плагинов через Tor.\n\nИспользуйте способ Сохранить как.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave preko anonimizacijskega omrežja Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton 提供一个按钮来方便的使用或禁用 Tor 代理
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties	2008-06-02 06:18:17 UTC (rev 14890)
@@ -7,3 +7,4 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton 提供一個切換啟用/停用 Proxy 的按鈕
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/defaults/preferences/preferences.js	2008-06-02 06:18:17 UTC (rev 14890)
@@ -57,6 +57,7 @@
 pref("extensions.torbutton.crashed",false);
 pref("extensions.torbutton.block_cert_dialogs",false);
 pref("extensions.torbutton.asked_ca_disable",false);
+pref("extensions.torbutton.warned_ff3",false);
 
 // Security prefs:
 pref("extensions.torbutton.no_tor_plugins",true);

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2008-06-02 01:38:07 UTC (rev 14889)
+++ torbutton/trunk/src/install.rdf	2008-06-02 06:18:17 UTC (rev 14890)
@@ -4,9 +4,9 @@
 
     <Description about="urn:mozilla:install-manifest">
         <em:name>Torbutton</em:name>
-        <em:creator>Scott Squires &amp; Mike Perry</em:creator>
+        <em:creator>Mike Perry &amp; Scott Squires</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.1.18alpha-dev</em:version>
+        <em:version>1.2.0rc1</em:version>
         <em:homepageURL>https://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>