[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [torbutton/master 29/31] Output from the transifex dance from translations.txt



Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Mon, 3 Jan 2011 22:39:02 -0600
Subject: Output from the transifex dance from translations.txt
Commit: 5edb26bfb3025002bc8a1add20ee9d39e79c232f

---
 src/chrome/locale/af/torbutton.dtd           |    1 +
 src/chrome/locale/ar/torbutton.dtd           |    1 +
 src/chrome/locale/ar/torbutton.properties    |    2 +-
 src/chrome/locale/bg/torbutton.dtd           |    1 +
 src/chrome/locale/bms/torbutton.properties   |    2 +-
 src/chrome/locale/bo/torbutton.dtd           |    1 +
 src/chrome/locale/ca/torbutton.dtd           |    1 +
 src/chrome/locale/cs/torbutton.dtd           |    1 +
 src/chrome/locale/da/torbutton.dtd           |    1 +
 src/chrome/locale/de/torbutton.dtd           |    1 +
 src/chrome/locale/de/torbutton.properties    |    2 +-
 src/chrome/locale/el/torbutton.dtd           |    1 +
 src/chrome/locale/es/torbutton.dtd           |    1 +
 src/chrome/locale/es/torbutton.properties    |    8 ++++----
 src/chrome/locale/eu/torbutton.dtd           |    1 +
 src/chrome/locale/fa/torbutton.dtd           |    1 +
 src/chrome/locale/fi/torbutton.dtd           |    1 +
 src/chrome/locale/fi/torbutton.properties    |    2 +-
 src/chrome/locale/fr/torbutton.dtd           |    1 +
 src/chrome/locale/fr/torbutton.properties    |    2 +-
 src/chrome/locale/fur/torbutton.dtd          |    1 +
 src/chrome/locale/gl/torbutton.dtd           |    1 +
 src/chrome/locale/gu/torbutton.dtd           |    1 +
 src/chrome/locale/he/torbutton.dtd           |    1 +
 src/chrome/locale/hi/torbutton.dtd           |    1 +
 src/chrome/locale/hr/torbutton.dtd           |    1 +
 src/chrome/locale/hu/torbutton.dtd           |    1 +
 src/chrome/locale/id/torbutton.dtd           |    1 +
 src/chrome/locale/id/torbutton.properties    |    2 +-
 src/chrome/locale/is/torbutton.dtd           |    1 +
 src/chrome/locale/it/torbutton.dtd           |    1 +
 src/chrome/locale/ja/torbutton.dtd           |    1 +
 src/chrome/locale/ka/torbutton.dtd           |    1 +
 src/chrome/locale/km/torbutton.dtd           |    1 +
 src/chrome/locale/ko/torbutton.dtd           |    1 +
 src/chrome/locale/ku/torbutton.dtd           |    1 +
 src/chrome/locale/mt/torbutton.dtd           |    1 +
 src/chrome/locale/nb/torbutton.dtd           |    1 +
 src/chrome/locale/nb/torbutton.properties    |    2 +-
 src/chrome/locale/nl/torbutton.dtd           |    1 +
 src/chrome/locale/nl/torbutton.properties    |    2 +-
 src/chrome/locale/pa/torbutton.dtd           |    1 +
 src/chrome/locale/pl/torbutton.dtd           |    1 +
 src/chrome/locale/pl/torbutton.properties    |    2 +-
 src/chrome/locale/pt-BR/torbutton.dtd        |    1 +
 src/chrome/locale/pt/torbutton.dtd           |    1 +
 src/chrome/locale/ro/torbutton.dtd           |    1 +
 src/chrome/locale/ro/torbutton.properties    |    2 +-
 src/chrome/locale/ru/torbutton.dtd           |    1 +
 src/chrome/locale/ru/torbutton.properties    |    2 +-
 src/chrome/locale/sl/torbutton.dtd           |    1 +
 src/chrome/locale/sq/torbutton.dtd           |    1 +
 src/chrome/locale/sv/torbutton.dtd           |    1 +
 src/chrome/locale/sw/torbutton.dtd           |    1 +
 src/chrome/locale/th/torbutton.dtd           |    1 +
 src/chrome/locale/tr/torbutton.dtd           |    1 +
 src/chrome/locale/tr/torbutton.properties    |    2 +-
 src/chrome/locale/uk/torbutton.dtd           |    1 +
 src/chrome/locale/vi/torbutton.dtd           |    1 +
 src/chrome/locale/zh-CN/torbutton.dtd        |    1 +
 src/chrome/locale/zh-CN/torbutton.properties |    2 +-
 src/chrome/locale/zh-HK/torbutton.dtd        |    1 +
 src/chrome/locale/zh-TW/torbutton.dtd        |    1 +
 63 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index d1af503..706bb0e 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "اÙ?تÙ?ر">
 <!ENTITY torbutton.prefs.non_tor "اÙ?تÙ?ر Ù?عطÙ?">
 <!ENTITY torbutton.prefs.restore_tor "Ø®Ù?اÙ? بدء استعادة اÙ?جÙ?سةØ? اضبط حاÙ?Ø© اÙ?تÙ?ر Ø¥Ù?Ù?:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "أعد تحÙ?Ù?Ù? Ù?عاء اÙ?Ù?عÙ?ات/اÙ?سح اÙ?Ù?عÙ?ات عÙ?د اÙ?Ù?Ù?ار Ù?Ù?رÙ?Ù?س (Ù?حبÙ?Ø°)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "احÙ?ظ اÙ?Ù?عÙ?ات عÙ? تÙ?عÙ?Ù? تÙ?ر Ù?عÙ?د تعطÙ?Ù?Ù? Ù?Ù? Ø£Ù?عÙ?Ø© Ù?Ø­Ù?Ù?Ø© (خطر)">
 <!ENTITY torbutton.prefs.clear_http_auth "اÙ?سح جÙ?سات اÙ?Ù?صادÙ?Ø© Ù?Ù? HTTP (Ù?حبÙ?Ø°)">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 3781419..66c402c 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (أساسÙ?)
 torbutton.popup.external.title = تحÙ?Ù?Ù? Ù?حتÙ?Ù? خارجÙ?Ø?
 torbutton.popup.external.app = Ù?Ù?اÙ? حاجة Ù?استخداÙ? تطبÙ?Ù? خارجÙ? Ù?Ù?تعاÙ?Ù? Ù?ع:\n\n
 torbutton.popup.external.note = \n\nÙ?Ù?احظة: اÙ?تطبÙ?Ù?ات اÙ?خارجÙ?Ø© Ù?Ù?ست Ø¢Ù?Ù?Ø© Ù?ع تÙ?ر بشÙ?Ù? اÙ?تراضÙ? Ù?Ù?Ù?Ù?Ù? Ø£Ù? تÙ?Ø´Ù? Ù?Ù?Ù?تÙ?!\n
-torbutton.popup.external.suggest = \nإذا Ù?اÙ? Ù?ذا اÙ?Ù?Ù?Ù? غÙ?ر Ù?Ù?Ø«Ù?Ù?Ø? Ù?جب Ø£Ù? تحÙ?ظÙ? Ù?تشاÙ?دÙ? دÙ?Ù? اتصاÙ? باÙ?اÙ?ترÙ?ت Ø£Ù? داخÙ? جÙ?از اÙ?تراضÙ? VMØ?\nØ£Ù? خذ بعÙ?Ù? اÙ?اعتبار استخداÙ? Ù?Ù?Ù?Ù? تÙ?ر Ø´Ù?اÙ? Ù?Ø«Ù? T(A)ILS LiveCDØ? Ø£Ù? torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = إطÙ?اÙ? اÙ?تطبÙ?Ù?
 torbutton.popup.cancel = Ø¥Ù?غاء
 torbutton.popup.dontask = دائÙ?اÙ? أطÙ?Ù? اÙ?تطبÙ?Ù?ات ابتداءÙ? Ù?Ù? اÙ?Ø¢Ù?
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index 4835322..54523bd 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 5c31197..cea6b26 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index d857f19..1508492 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ved session genoprettelses start, sæt Tor tilstanden til:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Genindlæs cookie jar/ryd cookies ved Firefox crash (anbefales)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Gem både Tor og Ikke-Tor cookies i beskyttede krukker (farlige)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ryd HTTP auth sessioner (anbefales)">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 762dc07..e4f7e23 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Nicht-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Setze Tor-Modus bei Session-Wiederherstellung zu:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Lade die Cookiedatei/Lösche Cookies beim Absturz (empfohlen)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Speichere alle Cookies (Verbindungen über Tor oder nicht) in geschützten Dateien (gefährlich)">
 <!ENTITY torbutton.prefs.clear_http_auth "Lösche Sitzungen mit Authentifizierung (empfohlen)">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 4777c50..f7a7e88 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (kritisch)
 torbutton.popup.external.title = Externen Inhalt laden?
 torbutton.popup.external.app = Eine externe Applikation wird benötigt, um mit dem folgenden Objekt umzugehen:\n\n
 torbutton.popup.external.note = \n\nAnmerkung: Externe Applikationen sind im Allgemeinen NICHT Tor gesichert und können Sie verraten!\n
-torbutton.popup.external.suggest = \nFalls diese Datei nicht vertrauenswürdig ist, sollten Sie diese entweder speichern und offline ansehen oder in einer VM öffnen.\nAndernfalls können Sie auch einen transparenten Tor Proxy, wie zum Beispiel T(A)ILS LiveCD oder torsocks benützen.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Applikation starten
 torbutton.popup.cancel = Abbrechen
 torbutton.popup.dontask = Von nun an immer Applikationen laden
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index c96f424..a89c71f 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "ΧÏ?Ï?ίÏ? Tor">
 <!ENTITY torbutton.prefs.restore_tor "Î?Ï?αν γίνεÏ?αι εκκίνηÏ?η με αÏ?οκαÏ?άÏ?Ï?αÏ?η Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ?, Ï?οÏ?οθέÏ?ηÏ?η Ï?οÏ? Tor Ï?ε καÏ?άÏ?Ï?αÏ?η:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Î?Ï?αναÏ?Ï?Ï?Ï?Ï?Ï?η cookie jar/ εκκαθάÏ?ιÏ?η cookiew Ï?ε Ï?εÏ?ίÏ?Ï?Ï?Ï?η καÏ?άÏ?Ï?εÏ?Ï?ηÏ? Ï?οÏ? Firefox (Ï?Ï?νίÏ?Ï?αÏ?αι)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Î?Ï?οθήκεÏ?Ï?η cookies αÏ?Ï? και εκÏ?Ï?Ï? Tor Ï?ε Ï?Ï?οÏ?Ï?αÏ?εÏ?μένα αÏ?Ï?εία jar (εÏ?ικίνδÏ?νο)">
 <!ENTITY torbutton.prefs.clear_http_auth "Î?κκαθάÏ?ιÏ?η Ï?ιÏ?Ï?οÏ?οιημένÏ?ν  Ï?Ï?νεδÏ?ιÏ?ν HTTP (Ï?Ï?νιÏ?Ï?άÏ?αι)">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 5d10f6e..99e3dab 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Sin Tor">
 <!ENTITY torbutton.prefs.restore_tor "En el arranque de la restauración de la sesión, establecer el estado de Tor a:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recargar jar de cookies/eliminar cookies al fallar Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar cookies con Tor y sin Tor en jars protegidos (peligroso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Eliminar sesiones de autenticación HTTP (recomendado)">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 86618ee..367d327 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -7,11 +7,11 @@ torbutton.panel.plugins.enabled = Haga clic para deshabilitar componentes.
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton proporciona un botón para habilitar y deshabilitar el acceso al proxy Tor desde el Firefox de manera fácil.
-torbutton.popup.history.warning = Torbutton bloqueo actividad de una pestaña cargada en un estado diferente de Tor.\n\nEsto es para circunvenir los errores de programación 409737 y 417869 de Firefox.\n\nSi esta ventana aparece sin ninguna razón aparente, una de sus pestañas esta intentando recargarse en el background  y esta operación ha sido bloqueada.\n\nPara recargar esta pestaña en el estado actual de Tor, presione la tecla  'enter' en el cuadro 
+torbutton.popup.history.warning = Torbutton bloqueo actividad de una pestaña cargada en un estado diferente de Tor.\n\nEsto es para circunvenir los errores de programación 409737 y 417869 de Firefox.\n\nSi esta ventana aparece sin ninguna razón aparente, una de sus pestañas esta intentando recargarse en el background  y esta operación ha sido bloqueada.\n\nPara recargar esta pestaña en el estado actual de Tor, presione la tecla  'enter' en el cuadro \n
 torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa por Tor del contenido de un componente.\n\nUse la alternativa de â??Guardar Comoâ??.\n\n
 torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operación lenta y hace más lento el conmutador Tor. ¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, se más seguro hacer clic en Aceptar)
-torbutton.popup.ff3.warning = ¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\\n\\n¿Desea continuar de todos modos?\n
-torbutton.popup.toggle.warning = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.\\n. \n
+torbutton.popup.ff3.warning = ¡Advertencia!\n\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\n\n¿Desea continuar de todos modos?
+torbutton.popup.toggle.warning = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.
 torbutton.popup.test.success = ¡La prueba del proxy Tor finalizó con éxito!
 torbutton.popup.test.failure = ¡La prueba del proxy Tor FALL�! Revise las preferencias de su Proxy y de Polipo.
 torbutton.popup.test.confirm_toggle = La prueba más reciente de Tor proxy fallo al usar Tor.\n\n¿Estás seguro de que desea habilitar de todos modos?\n\nNota: Si usted ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias de Proxy Torbutton para eliminar esta advertencia.
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Cargar contenido externo?
 torbutton.popup.external.app = Una aplicación externa es necesaria para manejar:\n\n
 torbutton.popup.external.note = \n\nNOTA: Las aplicaciones externasa NO son de uso seguro para Tor por defecto y podrían desenmascararlo!\n
-torbutton.popup.external.suggest = \nSi este archivo no es de confiable, usted debería o guardarlo para verlo fuera de linea, en una MV\no considere utilizar un proxy de Tor transparente como el LiveCD T(A)ILS o torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Iniciar la aplicación
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de ahora, siempre iniciar la aplicación
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index d9ab6bd..7bbc1ee 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "تÙ?ر">
 <!ENTITY torbutton.prefs.non_tor "غÛ?رتÙ?ر">
 <!ENTITY torbutton.prefs.restore_tor "در صÙ?رت بازگشتÙ? Ù?شستØ? Ù?ضعÛ?ت تÙ?ر را بÙ? اÛ?Ù? صÙ?رت تÙ?ظÛ?Ù? Ú©Ù?:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "بار گذارÛ? Ù?جدد Ú©Ù?Ú©Û? jar/پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا در Ù?Ù?گاÙ? از کا اÙ?تادÙ? Ù?اÛ?رÙ?اکس (تÙ?صÛ?Ù? شدÙ?)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "ذخÛ?رÙ? Ú©Ù?Ú©Û? Ù?اÛ? تÙ?ر Ù? غÛ?رتÙ?ر در jarÙ?اÛ? Ø­Ù?اظت شدÙ? (خطرÙ?اک)">
 <!ENTITY torbutton.prefs.clear_http_auth "پاک کردÙ? Ù?شست Ù?اÛ? احرازÙ?Ù?Û?ت HTTP (تÙ?صÛ?Ù? شدÙ?)">
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index d270c15..67cedef 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ei-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Palautettaessa kaatunutta istuntoa, aseta Tor tilaksi:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Lataa ja poista evästeet kun FF kaatuu (suositeltava)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Tallenna sekä Tor että Ei-Tor evästeet suojattuun hakemistoon(vaarallista)">
 <!ENTITY torbutton.prefs.clear_http_auth "Poista HTTP tunnistetut istunnot (suositeltava)">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index a729cc9..c6c8a41 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (kriittinen)
 torbutton.popup.external.title = Ladataanko ulkopuolinen sisältö?
 torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n
 torbutton.popup.external.note = \n\nHUOM: Ulkoiset sovellukset eivät ole oletusarvoisesti Tor turvallisia ja saattavat poistaa Tor suojauksesi!\n
-torbutton.popup.external.suggest = \nJos tiedosto ei ole turvallisesta lähteestä, sinun tulisi joko tallettaa se tarkastellaksesi sitä offline tilassa, tai VM:ssä, \ntai harkitse voisitko käyttää läpinäkyvää Tor välityspalvelinta kuten T(A)ILS LiveCD tai torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Käynnistä sovellus
 torbutton.popup.cancel = Peruuta
 torbutton.popup.dontask = Käynistä sovellus joka kerta tästä eteenpäin
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 0aa373e..78cef4b 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Lors d'une restauration de session, mettre Tor en état:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recharger la cookie jar et supprimer cookies lors d'un plantage de Firefox (recommandé)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisés (dangereux)">
 <!ENTITY torbutton.prefs.clear_http_auth "Supprimer les sessions HTTP authentifiées (recommandé)">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 8873ec5..f473a68 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (indispensable)
 torbutton.popup.external.title = Charger un contenu externe ?
 torbutton.popup.external.app = Une application externe est requise pour gérer:\n\n
 torbutton.popup.external.note = \n\nNOTE: Les applicatiosn externes ne sont pas saines par défaut pour Tor et peuvent vous démasquer !\n
-torbutton.popup.external.suggest = \nSi ce fichier n'est pas fiable, vous devez soit le sauvegarder pour le visionner hors ligne ou avec une machine virtuelle,\nou envisager d'utiliserk un proxy Tor transparent comme T(A)ILS LiveCD ou torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Lancer l'application
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = Toujours lancer les applications à partir de maintenant
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index e2934b8..8ecadcf 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "��ર">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 87fef24..a70f4fb 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index e8fa98a..43453a2 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index e0a44be..9a92bd2 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Saat memulai browser dengan sesi dipulihkan, tetapkan kondisi Tor:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Muat ulang cookie jar/bersihkan cookie saat Firefox mengalami kerusakan (disarankan)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Simpan baik cookie Tor maupun Non-Tor dalam jar terproteksi (berbahaya)">
 <!ENTITY torbutton.prefs.clear_http_auth "Bersihkan sesi HTTP terotorisasi (disarankan)">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 2b81a4b..068cbd0 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (krusial)
 torbutton.popup.external.title = Muat konten eksternal?
 torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
 torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
-torbutton.popup.external.suggest = \nApabila berkas ini tidak dapat dipercaya, Anda sebaiknya menyimpannya untuk dilihat secara offline atau dalam sebuah VM,\natau pertimbangkan untuk menggunakan proxy Tor transparan seperti T(A)ILS LiveCD atau torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Luncurkan aplikasi.
 torbutton.popup.cancel = Batal
 torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 58f74cf..2d64d16 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Al ripristino di una sessione, imposta lo stato di Tor a:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ricarica l'archivio dei cookies/cancella i cookies a un crash di Firefox (consigliato)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Conserva sia i cookie Tor sia quelli Non-Tor in archivi protetti (pericoloso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Cancella le sessioni HTTP autenticate (consigliato)">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index ddf1d95..555466d 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 17a4bd6..ba5b125 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Under oppstart av en gjenopprettet sesjon, sett Tor-status til:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Last jar med informasjonskapsler på nytt / slett informasjonskapsler når Firefox kræsjer (anbefalt)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Lagre informasjonskapsler for både Tor og ikke-Tor i beskyttende jar (farlig)">
 <!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte sesjoner (anbefalt)">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 243523f..6c165cd 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -8,7 +8,7 @@ torbutton.panel.label.disabled = Tor er deaktivert
 torbutton.panel.label.enabled = Tor er aktivert
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton legger til en knapp som gjør det enkelt å aktivere eller deaktivere Firefox sin tilgang til Tor-proxyen
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blokkerte direkte Tor-lasting av plugin-innhold.\n\nBruk lagre-som istedenfor.
+torbutton.popup.plugin.warning = Torbutton blokkerte direkte Tor-lasting av plugin-innhold.\n\nBruk lagre-som istedenfor.\n
 torbutton.popup.confirm_ca_certs = Torbutton notis: Det virker som om du ikke har noen egne Certificate Authorities. � undersøke Certificate Authority-listen er en treg operasjon og kommer til å gjøre bytte til Tor saktere. Vil du bare deaktivere isolasjonen av Certificate Authority serfikater? (Hvis du ikke forstår dette er det trygt å trykke på OK)
 torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton i Firefox 3 er kjent for å lekke tidssone og live-bokmerker via Tor.\n\n�nsker du å fortsette allikevel?
 torbutton.popup.toggle.warning = Du må toggle (deaktivere+aktivere) Tor eller starte nettleseren på nytt for at endringene skal tre i kraft.
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 2e15325..7c2772c 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "niet Tor">
 <!ENTITY torbutton.prefs.restore_tor "Bij opstart met sessieherstel, stel de Tor status in als : ">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Herlaad de cookie ruimte/verwijder de cookies bij een Firefox crash (aanbevolen)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Sla zowel Tor- als niet-Torcookies op in beschermde ruimtes (gevaarlijk)">
 <!ENTITY torbutton.prefs.clear_http_auth "Verwijder HTTP-geauthoriseerde sessies (aanbevolen)">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index b4bd94b..eaedc67 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (cruciaal)
 torbutton.popup.external.title = Externe inhoud laden ?
 torbutton.popup.external.app = Een externe toepassing is nodig voor : \n\n
 torbutton.popup.external.note = \n\n Opmerking : Externe toepassingen zijn NIET veilig en kunnen U ontmaskeren.\n
-torbutton.popup.external.suggest = Indien dit bestand niet vertrouwd wordt, zou het beter opgeslaan worden om offline te openen of in een VM,\n of maak gebruik van een transparante Tor proxy zoals T(A)ILS LiveCD of torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Toepassing starten
 torbutton.popup.cancel = Annuleren
 torbutton.popup.dontask = Vanaf nu steeds de toepassing starten
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 78ccc30..6acccf8 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "bez Tora">
 <!ENTITY torbutton.prefs.restore_tor "Po przywróceniu sesji, ustaw stan Tora na:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "UsuÅ? ciasteczka z magazynów przy nieoczekiwanym zamkniÄ?ciu Firefoxa (zalecane)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Zapisuj wszystkie ciasteczka w zabezpieczonych magazynach(niebezpieczne)">
 <!ENTITY torbutton.prefs.clear_http_auth "CzyÅ?Ä? sesje autentykacji HTTP (zalecane)">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index fa78519..039f1f9 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (wymagane)
 torbutton.popup.external.title = ZaÅ?adowaÄ? zewnÄ?trznÄ? zawartoÅ?Ä??
 torbutton.popup.external.app = ZawnÄ?trzna aplikacja jest wymagana, aby obsÅ?użyÄ?:\n\n
 torbutton.popup.external.note = \n\nUWAGA: ZewnÄ?trzne aplikacje NIE sÄ? domyÅ?lnie bezpieczne przy używaniu Tora i mogÄ? CiÄ? odkryÄ?!\n
-torbutton.popup.external.suggest = \nJesli ten plik jest niezaufany, powinno siÄ? go zachowaÄ? do oglÄ?dania offline lub w maszynie wirtualnej,\nlub rozważyÄ? używanie przezroczystego proxy Tor, jak T(A)ILS LiveCD lub torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Uruchom aplikacjÄ?
 torbutton.popup.cancel = Anuluj
 torbutton.popup.dontask = Od teraz zawsze uruchamiaj aplikacje
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 5a18f56..9d68238 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Não-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Quando restaurar sessão, definir estado do Tor para:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookie/limpar cookies em uma falha do Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não de Tor, em recipientes protegidos (Perigoso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessões HTTP autenticadas (recomendado)">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index e53ee37..2829bed 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Não-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Na sessão restaurada, ajustar o estado do Tor para:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookies/limpar cookies em caso de falha do Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não do Tor, em recipientes protegidos (perigoso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessões HTTP autenticadas (recomendado)">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 22a8ed2..9cee850 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "La îniÈ?ierea sesiunii restaurate, fixeazÄ? statutul Tor la:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "RestaureazÄ?/È?terge cookie-urile dupÄ? avarierea Firefox">
 <!ENTITY torbutton.prefs.dual_cookie_jars "SalveazÄ? cookie-urile Tor È?i Non-Tor în fiÈ?iere protejate (periculos)">
 <!ENTITY torbutton.prefs.clear_http_auth "È?terge sesiunile de autentificare HTTP (recomandat)">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index a8a8389..45617ad 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (critic)
 torbutton.popup.external.title = SÄ? încarc conÈ?inutul extern?
 torbutton.popup.external.app = O aplicaÅ£ie externÄ? este necesarÄ? sÄ? se ocupe de:\n\n
 torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄ?rile implicite Tor, Å?i vÄ? pot demasca!\n
-torbutton.popup.external.suggest = \nDacÄ? acest fiÅ?ier este de încredere, ar trebui sÄ? fie salvaÅ£ pentru a putea fi vizualizat offline sau într-o VM,\nsau luaÅ£i în considerare utilizarea unui mod transparent proxy Tor ca T(A)ILS LiveCD sau torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = PorneÈ?te aplicaÈ?ia
 torbutton.popup.cancel = Anulare
 torbutton.popup.dontask = Ã?ntotdeauna lanseazÄ? aplicaÅ£ii de acum încolo
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index b953365..5ad8f8d 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ð?е-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ð?о вÑ?емÑ? запÑ?Ñ?ка, еÑ?ли воÑ?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?, Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Tor в:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?оÑ?Ñ?Ñ?анавливаÑ?Ñ?/оÑ?иÑ?аÑ?Ñ? cookies поÑ?ле аваÑ?ии Firefox (желаÑ?елÑ?но)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ?аниÑ?Ñ? вÑ?е cookies в заÑ?иÑ?еннÑ?Ñ? Ñ?айлаÑ? (опаÑ?но)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ð?Ñ?иÑ?аÑ?Ñ? Ñ?еÑ?Ñ?ии аÑ?Ñ?енÑ?иÑ?икаÑ?ии HTTP (желаÑ?елÑ?но)">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 954a105..ba9b5d9 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (кÑ?иÑ?иÑ?но)
 torbutton.popup.external.title = Ð?агÑ?Ñ?зиÑ?Ñ? внеÑ?ние даннÑ?е?
 torbutton.popup.external.app = Ð?неÑ?нÑ?Ñ? пÑ?икладнаÑ? пÑ?огÑ?амма необÑ?одима длÑ? обÑ?абоÑ?ки:\n\n
 torbutton.popup.external.note = \n\nÐ?РÐ?Ð?Ð?ЧÐ?Ð?Ð?Ð?: Ð?неÑ?ние пÑ?иложениÑ? Ð?Ð? ЯÐ?Ð?ЯЮТСЯ безопаÑ?нÑ?ми длÑ? Tor по Ñ?молÑ?аниÑ?, и могÑ?Ñ? Ñ?азоблаÑ?иÑ?Ñ? ваÑ?!\n
-torbutton.popup.external.suggest = \nÐ?Ñ?ли вÑ? не довеÑ?Ñ?еÑ?е Ñ?Ñ?омÑ? Ñ?айлÑ?, Ñ?ледÑ?еÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? его длÑ? пÑ?оÑ?моÑ?Ñ?а пÑ?и оÑ?клÑ?Ñ?енной Ñ?еÑ?и или в виÑ?Ñ?Ñ?алÑ?ной маÑ?ине,\nлибо Ñ?аÑ?Ñ?моÑ?Ñ?еÑ?Ñ? возможноÑ?Ñ?Ñ? иÑ?полÑ?зованиÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?и Tor наподобие T(A)ILS LiveCD  или torsocks.\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Ð?апÑ?Ñ?Ñ?иÑ?Ñ? пÑ?иложение
 torbutton.popup.cancel = Ð?Ñ?мениÑ?Ñ?
 torbutton.popup.dontask = Ð? бÑ?дÑ?Ñ?ем вÑ?егда запÑ?Ñ?каÑ?Ñ? пÑ?иложениÑ?
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 29161ee..a73de8d 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ne-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ob zaÄ?etku obnovljene seje nastavi Tor na:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Naloži piÅ¡kotke iz predala /poÄ?isti piÅ¡kotke, Ä?e se Firefox samodejno zapre (proporoÄ?eno)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Shrani Tor in ne-tor piÅ¡kotke v zaÅ¡Ä?iten predal (nevarno)">
 <!ENTITY torbutton.prefs.clear_http_auth "PoÄ?isti HTTP seje (priporoÄ?eno)">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 44c666b..bdfe455 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 71a7940..5b63dfb 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 1916073..757b95c 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Oturumunda restore baÅ?langıç, Tor devlet ayarlamak için:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar 'Firefox çöktüÄ?ünde, çerezleri "jar" dosyalarından geri yükle(Tavsiye edilen)'>
 <!ENTITY torbutton.prefs.dual_cookie_jars "Tüm çerezleri korunan jar dosyalarında tut(tehlikeli)">
 <!ENTITY torbutton.prefs.clear_http_auth "HTTP oturum doÄ?rulamalarının tümünü temizle(önerilen)">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index d18d149..6fa187e 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial =
 torbutton.popup.external.title =             
 torbutton.popup.external.app = Kullanmak için harici bir uygulama seç:\n\n
 torbutton.popup.external.note = \n\nNOT: BaÅ?ka bir uyguluma sizin için güvenli olmayabilir!\n\n
-torbutton.popup.external.suggest = Bu dosya güvenilmezse, kaydetmeli yada dosyaya çevrimdıÅ?ı bakmalısınız.\n            
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = Uygulamayı çalıÅ?tır\n            
 torbutton.popup.cancel = Ä°ptal\n            
 torbutton.popup.dontask = Å?u andan itibaren uygulamayı sürekli çalıÅ?tır\r\n            
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 5a30b3e..28325e8 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "не-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ð?Ñ?и вÑ?дновленнÑ? Ñ?еÑ?Ñ?Ñ?, вÑ?Ñ?ановлÑ?ваÑ?и Ñ?Ñ?ан Tor Ñ?к:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?еÑ?еванÑ?ажиÑ?и кÑ?ки/оÑ?иÑ?Ñ?иÑ?и кÑ?ки пÑ?и падÑ?ннÑ? ФÑ?Ñ?еÑ?оÑ?Ñ? (Ñ?екомендовано)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð?беÑ?Ñ?гаÑ?и Ñ?к Tor, Ñ?ак Ñ? не-Tor кÑ?ки Ñ? заÑ?иÑ?еномÑ? Ñ?Ñ?анÑ? (небезпеÑ?но)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ð?Ñ?иÑ?Ñ?иÑ?и Ñ?еÑ?Ñ?Ñ? HTTP аÑ?Ñ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? (Ñ?екомендовано)">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index fa28511..36b720f 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Không-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Khi khá»?i chạy cùng phiên Ä?ược khôi phục, thiết lập tình trạng Tor thành:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Tải lại jar cookie/xóa cookie khi Firefox bá»? Ä?á»? vỡ (khuyến cáo)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "LÆ°u trữ cả Tor và Không-Tor trong các tập tin jar Ä?ược bảo vá»? (nguy hiá»?m)">
 <!ENTITY torbutton.prefs.clear_http_auth "Xóa các phiên xác thực HTTP (khuyến cáo)">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 860d1f5..abfb7fe 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "使� Tor">
 <!ENTITY torbutton.prefs.non_tor "�� Tor">
 <!ENTITY torbutton.prefs.restore_tor "æµ?è§?å?¨æ?¢å¤?è¿?ç¨?æ?¶ï¼?设置 Tor ç??ç?¶æ??为">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æº?å??é??è½½ cookie jar/æ¸?é?¤ cookie(æ?¨è??)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç?? jar æ??件中å??æ?¶ä¿?å­?使ç?¨ Tor å??ä¸?ç?¨ Tor æ?¶ç?? cookies(å?±é?©)">
 <!ENTITY torbutton.prefs.clear_http_auth "æ¸?é?¤ HTTP 认è¯?è¿?ç¨?(æ?¨è??)">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 0734a5d..fd9e1b3 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = è½½å?¥å¤?é?¨å??容ï¼?
 torbutton.popup.external.app = é??è¦?å¤?é?¨ç¨?åº?æ?¥å¤?ç??:\n\n
 torbutton.popup.external.note = \n\n注æ??ï¼?Tor ä¸?è?½ä½¿å¤?é?¨ç¨?åº?ç??访é?®å®?å?¨ï¼?å?¯è?½æ³?é?²æ?¨ç??身份ï¼?\n
-torbutton.popup.external.suggest = \nå¦?æ??è¿?个æ??件ä¸?å?¯ä¿¡ï¼?æ?¨åº?该å°?å?¶ä¿?å­?å??离线å¯?ç??æ??ç½®äº?è??æ??æ?ºä¸­å¯?ç??ï¼?\næ??è??使ç?¨è¯¸å¦? T(A)ILS LiveCDã??torsocks æ?? TorVM ç??é??æ?? Tor 代ç??ã??\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like T(A)ILS LiveCD or torsocks.\n
 torbutton.popup.launch = ����
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = æ­¤å??æ?»æ?¯å?¯å?¨ç¨?åº?
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 7e1fb3b..998eb76 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index de588e3..269ead7 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -76,6 +76,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
 <!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 (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-- 
1.7.1