[or-cvs] r18834: {torbutton} Update translations from pootle. (in torbutton/trunk/src/chrome/locale: ar de-AT de-CH de-DE el-GR es fa-IR fr-FR hr-HR it-IT nl-NL pl-PL pt-BR ru sl-SI zh-CN zh-TW)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-09 21:04:23 -0400 (Mon, 09 Mar 2009)
New Revision: 18834

Modified:
   torbutton/trunk/src/chrome/locale/ar/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
   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/es/torbutton.dtd
   torbutton/trunk/src/chrome/locale/es/torbutton.properties
   torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
   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/pl-PL/torbutton.properties
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
   torbutton/trunk/src/chrome/locale/ru/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ru/torbutton.properties
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
Log:

Update translations from pootle.



Modified: torbutton/trunk/src/chrome/locale/ar/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ar/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/ar/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,7 +60,6 @@
 <!ENTITY torbutton.prefs.forms "الاستمارات">
 <!ENTITY torbutton.prefs.block_tforms "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عمل تور (محبذ)">
 <!ENTITY torbutton.prefs.block_ntforms "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عدم عمل تور (اختياري)">
-<!ENTITY torbutton.prefs.notor_sessionstore "امنع حافظ الجلسة من حفظ الألسنة المفتوحة أثناء عمل تور (محبذ)">
 <!ENTITY torbutton.prefs.tor "تور">
 <!ENTITY torbutton.prefs.non_tor "غير تور">
 <!ENTITY torbutton.prefs.restore_tor "عند الانهيار استرجع الجلسة المحفوظة بطريق:">
@@ -72,13 +71,12 @@
 <!ENTITY torbutton.prefs.close_tor "أغلق كل نوافذ و ألسنة تور عند اغير الحالة (اختياري)">
 <!ENTITY torbutton.prefs.close_nontor "أغلق كل نوافذ و ألسنة غير تور عند اغير الحالة (اختياري)">
 <!ENTITY torbutton.prefs.block_links "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_certs "حفظ بيانات SSL في ملفات مختلفة لأجل تور/غير تور(محبّذ) ">
 <!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -27,43 +27,42 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_thwrite "Keinen Verlauf aufzeichnen, während Tor aktiviert ist (empfohlen)">
 <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
 <!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_history "Verlauf löschen, wenn auf Tor umgeschaltet wird (optional)">
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies selber (gefährlich)">
+<!ENTITY torbutton.prefs.clear_cookies "Beim Umschalten auf Tor Cookies löschen">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.no_updates "Updates während der Tor-Nutzung deaktivieren (empfohlen)">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
 <!ENTITY torbutton.prefs.dynamic "Dynamic Content">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.history "Verlauf">
+<!ENTITY torbutton.prefs.no_search "Suchvorschläge während der Tor-Nutzung deaktivieren (empfohlen)">
+<!ENTITY torbutton.prefs.shutdown "Herunterfahren">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Meine Cookies nicht beim Herunterfahren löschen">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.spoof_english "US English Browser vortäuschen">
+<!ENTITY torbutton.prefs.disable_referer "Keinen Referer während der Tor-Nutzung senden (einige Seiten werden evtl. nicht korrekt angezeigt)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "Die gespeicherte Session nach einem Absturz wiederherstellen über:">
 <!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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -2,8 +2,8 @@
 torbutton.button.tooltip.enabled = Tor deaktivieren
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren
+torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
 torbutton.panel.label.disabled = Tor deaktiviert
 torbutton.panel.label.enabled = Tor aktiviert
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,11 +1,11 @@
-<!ENTITY torbutton.prefs.title "Torbutton-Einstellungen">
+<!ENTITY torbutton.prefs.title "Einstellungen für Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Anzeige-Einstellungen">
-<!ENTITY torbutton.prefs.display_panel "Tor-Einstellung in der Statusleiste anzeigen">
-<!ENTITY torbutton.prefs.panel_format "Anzeigeformat in der Statusleiste">
+<!ENTITY torbutton.prefs.display_panel "Zeige Einstellung für den Tor-Proxy in der Statusleiste an">
+<!ENTITY torbutton.prefs.panel_format "Anzeigeformat der Statusleiste">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
 <!ENTITY torbutton.prefs.panel_icon_format "Symbol">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-Einstellungen">
-<!ENTITY torbutton.prefs.recommended_settings "Empfohlene Proxy-Einstellungen für meine Firefox-Version">
+<!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxy-Einstellungen für meine Firefox-Version">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden">
 <!ENTITY torbutton.prefs.custom_settings "Individuelle Proxy-Einstellungen verwenden">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:">
@@ -28,21 +28,21 @@
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen">
-<!ENTITY torbutton.prefs.block_thread "Lesen von History Einträgen während der Benutzung von Tor verhindern (wichtig)">
-<!ENTITY torbutton.prefs.block_thwrite "Schreiben von History Einträgen während der Benutzung von Tor verhindern (empfohlen)">
-<!ENTITY torbutton.prefs.block_nthread "Lesen von History Einträgen ausserhalb der Benutzung von Tor verhindern (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Schreiben von History Einträgen ausserhalb der Benutzung von Tor verhindern (optional)">
-<!ENTITY torbutton.prefs.clear_history "History Informationen bei An- und Abschalten von Tor löschen (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Zugriff auf Tor Festplatten Cache verhindern und Cache Informationen bei An- und Abschalten von Tor löschen">
-<!ENTITY torbutton.prefs.block_cache "Verhindern des Zugriffs auf Festplatten- und Speicher Cache während Tor läuft">
-<!ENTITY torbutton.prefs.cookie_jars "Speichern von Cookies, die nicht zu Tor gehören in einem gesicherten jar">
+<!ENTITY torbutton.prefs.block_thread "Lesen von Einträgen der besuchten Seiten (History) während der Benutzung von Tor verhindern (wichtig)">
+<!ENTITY torbutton.prefs.block_thwrite "Schreiben von Einträgen der besuchten Seiten (History) während der Benutzung von Tor verhindern (empfohlen)">
+<!ENTITY torbutton.prefs.block_nthread "Lesen von Einträgen der besuchten Seiten (History) außerhalb der Benutzung von Tor verhindern (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Schreiben von Einträgen der besuchten Seiten (History) außerhalb der Benutzung von Tor verhindern (optional)">
+<!ENTITY torbutton.prefs.clear_history "Informationen zu besuchten Seiten (History) bei An- und Abschalten von Tor löschen (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Zugriff auf Festplatten-Cache verhindern und Cache-Informationen bei An- und Abschalten von Tor löschen">
+<!ENTITY torbutton.prefs.block_cache "Verhindere den Zugriff auf Festplatten- und Speicher-Cache während Tor aktiviert ist">
+<!ENTITY torbutton.prefs.cookie_jars "Speichern von Cookies, die nicht zu Tor gehören in einer gesicherten jar-Datei">
 <!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies manuell (gefährlich)">
 <!ENTITY torbutton.prefs.clear_cookies "Cookies beim An- und Abschalten von Tor löschen">
-<!ENTITY torbutton.prefs.disable_plugins "Erweiterungen während der Tor-Benutzung deaktivieren (wichtig)">
+<!ENTITY torbutton.prefs.disable_plugins "Erweiterungen während der Benutzung von Tor deaktivieren (wichtig)">
 <!ENTITY torbutton.prefs.kill_bad_js "Gefährliches JavaScript kontrollieren (wichtig)">
-<!ENTITY torbutton.prefs.isolate_content "Dynamisch generierte Daten während der Tor-Benutzung seperieren (wichtig)">
-<!ENTITY torbutton.prefs.no_updates "Aktualisierungen während der Tor-Benutzung deaktivieren (empfohlrn)">
-<!ENTITY torbutton.prefs.set_uagent "Browser-Bezeichnung während der Tor-Benutzung umstellen (wichtig)">
+<!ENTITY torbutton.prefs.isolate_content "Dynamisch generierte Daten während der Benutzung von Tor separieren (wichtig)">
+<!ENTITY torbutton.prefs.no_updates "Aktualisierungen während der Benutzung von Tor deaktivieren (empfohlen)">
+<!ENTITY torbutton.prefs.set_uagent "Browser-Bezeichnung während der Benutzung von Tor umstellen (wichtig)">
 <!ENTITY torbutton.prefs.dynamic "Dynamisch generierte Inhalte">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
@@ -51,16 +51,15 @@
 <!ENTITY torbutton.prefs.shutdown "Herunterfahren">
 <!ENTITY torbutton.prefs.tor_shutdown "Cookies beim Beenden des Browsers löschen (wenn Tor aktiv ist)">
 <!ENTITY torbutton.prefs.all_shutdown "Cookies beim Beenden des Browsers löschen (immer)">
-<!ENTITY torbutton.prefs.no_shutdown "Cookies nicht löschen">
-<!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (angeraten)">
+<!ENTITY torbutton.prefs.no_shutdown "Cookies beim Beenden des Browers nicht löschen">
+<!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (empfohlen)">
 <!ENTITY torbutton.prefs.headers "Überschriften">
 <!ENTITY torbutton.prefs.spoof_english "Englischen Browser (US) vortäuschen">
 <!ENTITY torbutton.prefs.disable_referer "Keine Informationen über vorher besuchte Seiten (Referrer) senden (führt zu Problemen mit manchen Seiten)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deaktiviere die DOM-Speicherung während der Tor-Nutzung (wichtig)">
+<!ENTITY torbutton.prefs.disable_domstorage "Deaktiviere die DOM-Speicherung während der Benutzung von Tor (wichtig)">
 <!ENTITY torbutton.prefs.forms "Formulare">
-<!ENTITY torbutton.prefs.block_tforms "Speichern von Passworten und Formularen während Tor-Benutzung deaktivieren (empfohlen)">
+<!ENTITY torbutton.prefs.block_tforms "Speichern von Passworten und Formularen während Benutzung von Tor deaktivieren (empfohlen)">
 <!ENTITY torbutton.prefs.block_ntforms "Speichern von Passworten und Formularen generell deaktivieren (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Verhindern, dass Tor-initiierte Browser-Tabs gespeichert werden (empfohlen)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Nicht-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Nach einem Absturz den letzten Stand laden über:">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/es/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/es/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,7 +60,6 @@
 <!ENTITY torbutton.prefs.forms "Formularios">
 <!ENTITY torbutton.prefs.block_tforms "Bloquear el almacenamiento de contraseñas y formularios al usar Tor (recomendado)">
 <!ENTITY torbutton.prefs.block_ntforms "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Evitar que el almacenamiento de sesión guarde pestañas de Tor (recomendado)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Sin Tor">
 <!ENTITY torbutton.prefs.restore_tor "Después de un fallo, restaurar sesión desde:">
@@ -72,13 +71,12 @@
 <!ENTITY torbutton.prefs.close_tor "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)">
 <!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)">
 <!ENTITY torbutton.prefs.block_links "Bloquear clicks en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_certs "Guardar certificados SSL en jarras separadas para Tor/No Tor (recomendado)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Guardar certificados CA en jarras separadas para Tor/No Tor (recomendado)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/es/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/es/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/es/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,16 +1,16 @@
 torbutton.button.tooltip.disabled = Activar Tor
 torbutton.button.tooltip.enabled = Desactivar Tor
 torbutton.panel.tooltip.disabled = Click para activar Tor
-torbutton.panel.tooltip.enabled = Click para desactivar Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.tooltip.enabled = Click para deshabilitar Tor
+torbutton.panel.plugins.disabled = Click para habilitar componentes.
+torbutton.panel.plugins.enabled = Click para deshabilitar componentes.
 torbutton.panel.label.disabled = Tor Desactivado
 torbutton.panel.label.enabled = Tor Activado
 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.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?
+torbutton.popup.confirm_ca_certs = Noticia de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operacion lenta y detiene el interruptor Tor. ¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, es seguro hacer click OK)
+torbutton.popup.ff3.warning = ¡Peligro!\n\nTorbutton en Firefox 3 es conocido por delatar tu zona horaria y feeds de marcadores cuando se utiliza Tor. Adicionalmente, no ha sido extensivamente probado para la seguridad de Tor y uso como en Firefox 3.\n\n¿Desea continuar de todas maneras?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings.

Modified: torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,84 +1,82 @@
-<!ENTITY torbutton.prefs.title "تنظیمات برای دکمه تُر">
-<!ENTITY torbutton.prefs.display_settings "تنظیمات نمایش">
-<!ENTITY torbutton.prefs.display_panel "نمایش وضعیت تُر در میله وضعیت">
-<!ENTITY torbutton.prefs.panel_format "نمایش در میله وضعیت:">
-<!ENTITY torbutton.prefs.panel_text_format "متن">
-<!ENTITY torbutton.prefs.panel_icon_format "شمایل">
-<!ENTITY torbutton.prefs.tor_settings "تنظیمات پیشکار">
-<!ENTITY torbutton.prefs.recommended_settings "بکاربردن تنظیمات پیشنهادی برای نسخه فایرفاکس من">
-<!ENTITY torbutton.prefs.use_privoxy "بکاربردن پریوکسی">
-<!ENTITY torbutton.prefs.custom_settings "بکاربردن تنظیمات سفارشی برای پیشکار">
-<!ENTITY torbutton.prefs.proxy.host.http "پیشکار HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "پیشکار SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "پیشکار FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "پیشکار Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "میزبان SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "درگاه:">
-<!ENTITY torbutton.about.title "درباره دکمه تُر">
-<!ENTITY torbutton.pref_connection.notice "غیرفعال کردن دکمه تُر پیش از تغییر تنظیمات.">
-<!ENTITY torbutton.pref_connection.more_info "اطلاعات بیشتر">
-<!ENTITY torbutton.pref_connection_more_info.title "کمک">
-<!ENTITY torbutton.pref_connection_more_info.text "دکمه تُر فعال هم اکنون فعال شد. اگر می خواهید تنظیمات پیشکار را که به تُر اعمال نمی شود تغییر دهید, دکمه تُر را غیرفعال کنید و به اینجا برگردید. اگر می خواهید تنظیمات تُر را تغییر دهید, پنجره تنظیمات دکمه تُر را بکارببرید.">
-<!ENTITY torbutton.context_menu.toggle "فعال/غیرفعال کردن تُر">
-<!ENTITY torbutton.context_menu.toggle.key "I">
-<!ENTITY torbutton.context_menu.preferences "تنظیمات...">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
+<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.panel_text_format "Text">
+<!ENTITY torbutton.prefs.panel_icon_format "Icon">
+<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
+<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
+<!ENTITY torbutton.prefs.proxy.port "Port:">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
+<!ENTITY torbutton.pref_connection.more_info "More information">
+<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
+<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle.key "T">
+<!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "درباره دکمه تُر...">
-<!ENTITY torbutton.context_menu.about.key "O">
-<!ENTITY torbutton.button.label "دکمه تُر">
-<!ENTITY torbutton.button.tooltip "فشاردادن برای مقدار دهی آغازین در دکمه تُر">
-<!ENTITY torbutton.prefs.sec_settings "تنظیمات امنیت">
-<!ENTITY torbutton.prefs.block_thread "بازداشتن خواندن تاریخچه هنگام تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.block_thwrite "بازداشتن نوشتن تاریخچه هنگام تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.block_nthread "بازداشتن خواندن تاریخچه هنگام غیرتُر (اختیاری)">
-<!ENTITY torbutton.prefs.block_nthwrite "بازداشتن نوشتن تاریخچه هنگام غیر تُر (اختیاری)">
-<!ENTITY torbutton.prefs.clear_history "پاک کردن تاریخچه در ضامن تُر (اختیاری)">
-<!ENTITY torbutton.prefs.clear_cache "بازداشتن نهان گاه دیسک تُر و پاک کردن نهان گاه در ضامن تُر">
-<!ENTITY torbutton.prefs.block_cache "بازداشتن دسترسی به نهان گاه حافظه و دیسک هنگام تُر">
-<!ENTITY torbutton.prefs.cookie_jars "ذخیره کردن کوکی های غیر تُر در یک فال jar حفاظت شده">
-<!ENTITY torbutton.prefs.mmm_cookies "مدیریت کوکی ها به گونه دستی (خطرناک)">
-<!ENTITY torbutton.prefs.clear_cookies "پاک کردن کوکی ها در ضامن تُر">
-<!ENTITY torbutton.prefs.disable_plugins "غیرفعال کردن پلاگین ها هنگام استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.kill_bad_js "گیرانداختن جاوااسکریپت خطرناک (بسیار مهم)">
-<!ENTITY torbutton.prefs.isolate_content "مجزاکردن محتوی پویا وضعیت تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.no_updates "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.set_uagent "نشاندن عامل کاربر برای استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.dynamic "محتوای پویا">
-<!ENTITY torbutton.prefs.cookies "کوکی ها">
-<!ENTITY torbutton.prefs.cache "نهان گاه">
-<!ENTITY torbutton.prefs.history "تاریخچه">
-<!ENTITY torbutton.prefs.no_search "غیرفعال کردن پیشنهادهای جستجو هنگام تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.shutdown "بستن">
-<!ENTITY torbutton.prefs.tor_shutdown "پاک کردن کوکی های تُر هنگام بسته شدن مرورگر قادر تُر">
-<!ENTITY torbutton.prefs.all_shutdown "پاک کردن کوکی ها هنگام بستن مرورگر">
-<!ENTITY torbutton.prefs.no_shutdown "پاک نکردن کوکی ها هنگام بستن">
-<!ENTITY torbutton.prefs.disable_sessionstore "غیرفعال کردن ذخیره نشست (توصیه شده)">
-<!ENTITY torbutton.prefs.headers "سرآیندها">
-<!ENTITY torbutton.prefs.spoof_english "پیروی کردن از یک مرورگر آمریکایی (انگلیسی آمریکا)">
-<!ENTITY torbutton.prefs.disable_referer "نفرستادن referer هنگام استفاده تُر (موجب شکستن برخی از سایت ها می شود)">
-<!ENTITY torbutton.prefs.disable_domstorage "غیرغعال کردن ذخیره گاه DOM هنگام استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.forms "فرم ها">
-<!ENTITY torbutton.prefs.block_tforms "بازداشتن ذخیره اسم رمز + فرم هنگام تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.block_ntforms "بازداشتن ذخیره اسم رمز + فرم هنگام غیر تُر (اختیاری)">
-<!ENTITY torbutton.prefs.notor_sessionstore "جلوگیری از ذخیره نشست بواسطه ذخیره پنجره های تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.tor "تُر">
-<!ENTITY torbutton.prefs.non_tor "غیرتُر">
-<!ENTITY torbutton.prefs.restore_tor "پس از فروپاشی, بازگرداندن نشست ذخیره شده از راه:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "بازگذاری مجدد کوکی jar/پاک کردن کوکی ها در فروپاشی فایرفاکس (توصیه شده)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "ذخیره کوکی های تُر و غیرتُر در jarهای حفاظت شده (خطرناک)">
-<!ENTITY torbutton.prefs.clear_http_auth "پاک کردن نشست های احرازهویت HTTP (توصیه شده)">
-<!ENTITY torbutton.prefs.block_js_history "مجزاکردن دسترسی به تاریخچه ناوش وضعیت تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.resize_on_toggle "تغییراندازه ابعاد پنجره با مضربهای 40 تصویر دانه در ضامن (توصیه شده)">
-<!ENTITY torbutton.prefs.close_tor "بستن همه پنجره های تُر در ضامن (اختیاری)">
-<!ENTITY torbutton.prefs.close_nontor "بستن همه پنجره های غیرتُر در ضامن (اختیاری)">
-<!ENTITY torbutton.prefs.block_links "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)">
-<!ENTITY torbutton.prefs.jar_certs "ذخیره کردن گواهی های SSL در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.jar_ca_certs "ذخیره کردن گواهی های CA در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)">
+<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.button.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!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.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)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,16 +1,16 @@
-torbutton.button.tooltip.disabled = فعال کردن تُر
-torbutton.button.tooltip.enabled = غیرفعال کردن تُر
-torbutton.panel.tooltip.disabled = فشاردادن برای فعال کردن تُر
-torbutton.panel.tooltip.enabled = فشاردادن برای غیرفعال کردن تُر
-torbutton.panel.plugins.disabled = فشاردادن برای فعال کردن پلاگین ها
-torbutton.panel.plugins.enabled = فشاردادن برای غیرفعال کردن پلاگین ها
-torbutton.panel.label.disabled = تُر غیرفعال شد
-torbutton.panel.label.enabled = تُر فعال شد
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می دهد
-torbutton.popup.history.warning = دکمه تُر مانع ازدستکاری در تاریخچه شد.\n\n مشاهده و تغییر در تنظیمات تاریخچه برای اجازه دادن اینگونه دستکاری.\n
-torbutton.popup.plugin.warning = دکمه تُر مانع از نصب خودکار یک پلاگین شد.\n\nدر عوض ذخیره با نام را بکار ببرید.\n\n
-torbutton.popup.confirm_ca_certs = یادداشت دکمه تُر: بنظر میرسد که شما دارای اسناد سفارشی نمی باشید. بازرسی لیست اسناد زمان می برد و موجب کندی عملکرد ضامن تُر می شود. آیا می خواهید جداسازی اسناد را غیرفعال کنید؟ (اگر متوجه معنی نمی شوید, بهتر است روی بسیارخوب فشار دهید)
-torbutton.popup.ff3.warning = دکمه تُر در فایرفاکس 3 برای تغذیه کردن ناحیه زمان و لایومارک هنگام استفاده تُر شناخته شد. افزون بر اینکه بطور قابل توجه تست نشده برای امنیت تُر و استفاده در فایر فاکس 2.\n\nآیا می خواهید ادامه دهید؟
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\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 livemarks via Tor.\n\nDo you wish to continue anyway?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings.

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,7 +60,6 @@
 <!ENTITY torbutton.prefs.forms "Formulaires">
 <!ENTITY torbutton.prefs.block_tforms "Bloquer la sauvegarde de mot de passe+formulaire pendant l'utilisation de Tor (recommandé)">
 <!ENTITY torbutton.prefs.block_ntforms "Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (facultatif)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Empêcher la sauvegarde des onglets chargés par Tor">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Lors d'un plantage ou de la récupération d'un session, récupérez avec:">
@@ -78,12 +77,14 @@
 <!ENTITY torbutton.prefs.startup_state "Au démarrage, mettre Tor dans l'état:">
 <!ENTITY torbutton.prefs.shutdown_state "Ne pas lancer Tor">
 <!ENTITY torbutton.prefs.startup "Démarrage">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Empêcher l'enregistrement des onglets non-Tor par la sauvegarde de session">
 <!ENTITY torbutton.prefs.block_tor_file_net "Bloquer l'accès Tor au réseau à partir d'urls file:// (recommandé)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Bloquer l'accès non-Tor au réseau à partir d'urls file://">
 <!ENTITY torbutton.prefs.restore_defaults "Valeurs par défaut">
 <!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
 <!ENTITY torbutton.prefs.test_auto "Tester mes paramètres Tor lors de la première activation/désactivation suivant chaque démarrage de Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Désactiver les marques-pages dynamiques durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne pas écrire les cookies de Tor sur le disque">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne pas écrire les cookies Non-Tor sur le disque">
+<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,5 +1,5 @@
-torbutton.button.tooltip.disabled = Tor Actif
-torbutton.button.tooltip.enabled = Tor Inactif
+torbutton.button.tooltip.disabled = Activer Tor
+torbutton.button.tooltip.enabled = Désactiver Tor
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
 torbutton.panel.plugins.disabled = Cliquer pour activer les plugins

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,7 +60,6 @@
 <!ENTITY torbutton.prefs.forms "Moduli">
 <!ENTITY torbutton.prefs.block_tforms "Blocca il salvataggio di password nei moduli usando Tor (consigliato)">
 <!ENTITY torbutton.prefs.block_ntforms "Blocca il salvataggio di password nei moduli quando non si usa Tor (facoltativo)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Impedisci il salvataggio di schede aperte con Tor in una sessione (consigliato)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ripristina una sessione dopo un crash con:">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -27,58 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Ustawienia bezpieczeństwa">
+<!ENTITY torbutton.prefs.block_thread "Blokuj odczyt historii gdy Tor jest włączony (krytyczne)">
+<!ENTITY torbutton.prefs.block_thwrite "Blokuj zapis do historii gdy Tor jest włączony (zalecane)">
+<!ENTITY torbutton.prefs.block_nthread "Blokuj odczyt historii gdy Tor jest wyłączony (opcjonalnie)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blokuj zapis do historii gdy Tor jest wyłączony (opcjonalnie)">
+<!ENTITY torbutton.prefs.clear_history "Czyść historię przy wł/wył Tora (opcjonalnie)">
+<!ENTITY torbutton.prefs.clear_cache "Blokuj pamięć podręczną Tora i wyczyść ją przy wł/wył Tora">
+<!ENTITY torbutton.prefs.block_cache "Blokuj dostęp do pamięci podręcznej (dysk/pamięć) gdy Tor jest włączony">
+<!ENTITY torbutton.prefs.cookie_jars "Zapamiętuj ciasteczka z trybu zwykłego w zabezpieczonych magazynach">
+<!ENTITY torbutton.prefs.mmm_cookies "Będę sam zarządzał ciasteczkami (niebezpieczne)">
+<!ENTITY torbutton.prefs.clear_cookies "Czyść ciasteczka przy zmianie trybu Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Wyłącz wtyczki podczas użycia Tor (krytyczne)">
+<!ENTITY torbutton.prefs.kill_bad_js "Nadzoruj niebezpieczne skrypty (krytyczne)">
+<!ENTITY torbutton.prefs.isolate_content "Izoluj treść dynamiczną (krytyczne)">
+<!ENTITY torbutton.prefs.no_updates "Zablokuj aktualizacje podczas używania Tora (zalecane)">
+<!ENTITY torbutton.prefs.set_uagent "Ustaw identyfikację przeglądarki podczas używania Tora (ważne)">
+<!ENTITY torbutton.prefs.dynamic "Zawartość dynamiczna">
+<!ENTITY torbutton.prefs.cookies "Ciasteczka">
+<!ENTITY torbutton.prefs.cache "Pamięć podręczna">
+<!ENTITY torbutton.prefs.history "Historia">
+<!ENTITY torbutton.prefs.no_search "Wyłącz sugestie przy wyszukiwaniu podczas trybu Tor (zalecane)">
+<!ENTITY torbutton.prefs.shutdown "Wyłączenie">
+<!ENTITY torbutton.prefs.tor_shutdown "Usuń ciasteczka Tora gdy następuje wyłączenie w trybie z włączonym Torem">
+<!ENTITY torbutton.prefs.all_shutdown "Usuń ciasteczka zawsze przy wyłączaniu przeglądarki">
+<!ENTITY torbutton.prefs.no_shutdown "Nie usuwaj ciasteczek przy wyłączaniu">
+<!ENTITY torbutton.prefs.disable_sessionstore "Blokuj zapisywanie sesji przeglądarki (zalecane)">
+<!ENTITY torbutton.prefs.headers "Nagłówki">
+<!ENTITY torbutton.prefs.spoof_english "Udawaj przeglądarkę z USA">
+<!ENTITY torbutton.prefs.disable_referer "Nie wysyłaj adresu polecającego podczas używania Tora (niektóre strony mogą nie działać)">
+<!ENTITY torbutton.prefs.disable_domstorage "Blokuj zapisywanie DOM podczas używania Tora (krytyczne)">
+<!ENTITY torbutton.prefs.forms "Formularze">
+<!ENTITY torbutton.prefs.block_tforms "Blokuj zapamiętywanie haseł z formularzy (zalecane)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokuj zapamiętywanie haseł z formularzy gdy Tor nieaktywny (opcjonalnie)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore 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 (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.non_tor "bez Tora">
+<!ENTITY torbutton.prefs.restore_tor "Po nieoczekiwanym zamknięciu, odzyskaj zapisaną sesję poprzez:">
+<!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)">
+<!ENTITY torbutton.prefs.block_js_history "Zabroń dostępu do historii przeglądania gdy tryb Tor był aktywny (krytyczne)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Skaluj okna do wielokrotności 50px podczas używania Tora (zalecane)">
+<!ENTITY torbutton.prefs.close_tor "Zamykaj wszystkie karty i okna podczas zmiany trybu Tora (opcjonalne)">
+<!ENTITY torbutton.prefs.close_nontor "Zamykaj wszystkie okna i karty nie przeglądane w trybie Tor  podczas zmiany trybu (opcjonalnie)">
+<!ENTITY torbutton.prefs.block_links "Blokuj klikanie na łącza i przeładowania strony gdy zmienił się status Tora (opcjonalnie)">
+<!ENTITY torbutton.prefs.jar_certs "Zapisuj cetryfikaty SSL w osobnych magazynach, w każdym trybie (zalecane)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Zapisuj certyfikaty CA w osobnych magazynach, w każdym trybie (zalecane)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,16 +1,16 @@
-torbutton.button.tooltip.disabled = Włącz Tor
-torbutton.button.tooltip.enabled = Wyłącz Tor
-torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tor
-torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.button.tooltip.disabled = Włącz Tora
+torbutton.button.tooltip.enabled = Wyłącz Tora
+torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora
+torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora
+torbutton.panel.plugins.disabled = Kliknij aby włączyć wtyczki
+torbutton.panel.plugins.enabled = Kliknij aby wyłączyć wtyczki
 torbutton.panel.label.disabled = Tor wyłączony
 torbutton.panel.label.enabled = Tor włączony
-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.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?
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenie posiada przycisk do łatwego włączania/wyłączania proxy Tor
+torbutton.popup.history.warning = Torbutton zablokował niebezpieczną dla anonimowości operację na historii.\n\nZobacz Ustawienia historii aby zmienić to ustawienie.\n\n
+torbutton.popup.plugin.warning = Torbutton zablokował bezpośrednie odwołanie do Sieci przez plugin.\n\nUżyj Zapisz jako.\n\n
+torbutton.popup.confirm_ca_certs = Informacja Torbutton: Wygląda na to, że nie posiadasz dodatkowych wpisów Ośrodków Certyfikujących. Posiadanie takiej listy spowalnia przełączanie trybów Tora. Czy chciałbyś wyłączyć sprawdzanie Ośrodków Certyfikujących? (jeśli tego nie rozumiesz, możesz bezpiecznie kliknąć OK)
+torbutton.popup.ff3.warning = Ostrzeżenie!\n\nTorbutton na Firefox 3 posiada lukę, która ujawnia Twoją strefę czasową podczas pracy w trybie Tora. Ponadto nie został tak dokładnie przetestowany pod kątem bezpieczeństwa i uzyteczności jak na Firefox 2.\n\nCzy pomimo tego chcesz kontynuować?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings.

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -15,7 +15,7 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
 <!ENTITY torbutton.about.title "Sobre Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Desabilitar Torbutton para mudar essas configurações">
+<!ENTITY torbutton.pref_connection.notice "Desabilitar Torbutton para mudar essas configurações.">
 <!ENTITY torbutton.pref_connection.more_info "Mais informações">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton está habilitado. Se você deseja mudar as configurações de Proxy que não sejam do Tor, por favor desabilite Torbutton e retorne aqui. Se você deseja mudar as configurações do Tor, por favor, use a janela de preferência do Torbutton.">
@@ -27,58 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.sec_settings "Configurações de Segurança">
+<!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do TOR (importante)">
+<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do TOR (recomendado)">
+<!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do TOR (opcional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrita no histórico durante a não utilização do TOR (opcional)">
+<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alternar o uso do TOR (opcional)">
+<!ENTITY torbutton.prefs.clear_cache "Bloquear o cache de disco e limpar todos os caches ao alterar o uso do TOR">
+<!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do TOR">
+<!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num contêiner protegido">
+<!ENTITY torbutton.prefs.mmm_cookies "I manualmente gerenciarei meus cookies (atenção)">
+<!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alternar TOR">
+<!ENTITY torbutton.prefs.disable_plugins "Desabilitar plugins durante o uso do TOR (importante)">
+<!ENTITY torbutton.prefs.kill_bad_js "Deter os scripts perigosos de java (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolar os conteúdos dinâmicos no arquivo de estado de Tor (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Desabilitar updates durante o uso do TOR (recomendado)">
+<!ENTITY torbutton.prefs.set_uagent "Mascarar user agent durante utilização de TOR (importante)">
+<!ENTITY torbutton.prefs.dynamic "Conteúdo Dinâmico">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.history "Histórico">
+<!ENTITY torbutton.prefs.no_search "Desabilitar sugestões de pesquisa durante o uso do TOR (recomendado)">
+<!ENTITY torbutton.prefs.shutdown "Desligar">
+<!ENTITY torbutton.prefs.tor_shutdown "Limpar cookies quando o TOR estiver habilitado e o navegador for fechado">
+<!ENTITY torbutton.prefs.all_shutdown "Limpar cookies quando qualquer navegador for fechado">
 <!ENTITY torbutton.prefs.no_shutdown "Não limpar meus cookies ao desligar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.disable_sessionstore "Desabilitar função de salvar sessão (recomendado)">
+<!ENTITY torbutton.prefs.headers "Cabeçalho">
+<!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para Inglês US">
+<!ENTITY torbutton.prefs.disable_referer "Não enviar referer headers durante o uso de Tor (pode truncar alguns sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Desabilitar armazenamento DOM durante o uso do TOR (importante)">
+<!ENTITY torbutton.prefs.forms "Formulários">
+<!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + informações de formulários durante o uso do TOR (recomendado)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloquear senhas + informações de formulários quando não usar o TOR (opcional)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore 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 (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.non_tor "Não-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Depois de uma falha, restaurar sessão:">
+<!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)">
+<!ENTITY torbutton.prefs.block_js_history "Isolar o acesso ao histórico de navegação ao arquivo de estado de Tor (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Alterar o tamanho das páginas em múltiplos de 50px durante o uso de Tor (recomendado)">
+<!ENTITY torbutton.prefs.close_tor "Fechar todas as páginas e abas abertas com Tor ao comutar (opcional)">
+<!ENTITY torbutton.prefs.close_nontor "Fechar todas as páginas e abas não-Tor ao comutar (opcional)">
+<!ENTITY torbutton.prefs.block_links "Bloquear os link clicks e as recarga de páginas desde diferentes arquivos de estado de Tor (opcional)">
+<!ENTITY torbutton.prefs.jar_certs "Armazene certificados SSL em arquivos de estado de Tor separados para páginas Tor e não-Tor (recomendado)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Armazene certificados CA em arquivos de estado separados para páginas Tor e não-Tor (recomendado)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -2,15 +2,15 @@
 torbutton.button.tooltip.enabled = Desabilitar Tor
 torbutton.panel.tooltip.disabled = Clique para habilitar Tor
 torbutton.panel.tooltip.enabled = Clique para desabilitar Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = Clique para habilitar plugins
+torbutton.panel.plugins.enabled = Clique para desabilitar plugins
 torbutton.panel.label.disabled = Tor desabilitado
 torbutton.panel.label.enabled = Tor habilitado
 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.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?
+torbutton.popup.history.warning = Torbutton bloqueou alteração no histórico do status.\n\nAcesse as configurações do histórico para habilitar.\n\n
+torbutton.popup.plugin.warning = Torbutton bloqueou carregamento do plugin de conteúdo do TOR.\n\nUse o Salvar como.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificado de Autenticação pode ser uma operação lenta para oo TOR. Gostaria de desabilitar o modo de isolamento de Certificado de Autenticação? (Se você não entendeu, o mais seguro é clicar OK)
+torbutton.popup.ff3.warning = Atenção!\n\nEm Firefox 3 o Torbutton é conhecido por deixar escapar a sua zona horária e os livemark feeds durante o uso de Tor. Além disso, a seguridade e utilização nessa versão ainda não foram testadas exaustivamente como em Firefox 2.\n\nQuer continuar assim mesmo?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings.

Modified: torbutton/trunk/src/chrome/locale/ru/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/ru/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,7 +60,6 @@
 <!ENTITY torbutton.prefs.forms "Формы">
 <!ENTITY torbutton.prefs.block_tforms "Блокировать сохранение паролей и данных форм при использовании Tor (желательно)">
 <!ENTITY torbutton.prefs.block_ntforms "Блокировать сохранение паролей и данных форм при отключенном Tor (необяз.)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Вкладки Tor не сохраняются в общей сессии (желательно)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "не-Tor">
 <!ENTITY torbutton.prefs.restore_tor "После аварии восстанавливать сессию в режиме:">
@@ -72,13 +71,12 @@
 <!ENTITY torbutton.prefs.close_tor "Закрывать все окна и вкладки Tor при переключении режимов (необяз.)">
 <!ENTITY torbutton.prefs.close_nontor "Закрывать все окна и вкладки не-Tor при переключении режимов (необяз.)">
 <!ENTITY torbutton.prefs.block_links "Блокировать щелчки по ссылкам и перезагрузку страниц из разных режимов Tor (необяз.)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_certs "Хранить SSL сертификаты в раздельных jar-файлах для Tor/не-Tor (желательно)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Хранить CA сертификаты в раздельных jar-файлах для Tor/не-Tor (желательно)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/ru/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -2,8 +2,8 @@
 torbutton.button.tooltip.enabled = Отключить Tor
 torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor
 torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины
+torbutton.panel.plugins.enabled = Нажмите, чтобы отключить плагины
 torbutton.panel.label.disabled = Tor отключен
 torbutton.panel.label.enabled = Tor включен
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Кнопка включения/отключения доступа к Интернет через сеть Tor

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,4 +1,4 @@
-<!ENTITY torbutton.prefs.title "Torbutton 偏好">
+<!ENTITY torbutton.prefs.title "Torbutton 选项">
 <!ENTITY torbutton.prefs.display_settings "显示设置">
 <!ENTITY torbutton.prefs.display_panel "在状态栏显示 Tor 代理设置">
 <!ENTITY torbutton.prefs.panel_format "状态栏显示格式：">
@@ -27,58 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "点击初始化 Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.sec_settings "安全选项">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Tor运行时禁止写入历史(推荐)">
+<!ENTITY torbutton.prefs.block_nthread "Tor禁用时禁止读取历史(可选)">
+<!ENTITY torbutton.prefs.block_nthwrite "Tor禁用时禁止写入历史(可选)">
+<!ENTITY torbutton.prefs.clear_history "切换 Tor 时清除历史(可选)">
+<!ENTITY torbutton.prefs.clear_cache "禁用 Tor 硬盘缓存并在切换 Tor 时清除缓存">
+<!ENTITY torbutton.prefs.block_cache "Tor 运行时禁止访问硬盘缓存和内存缓存">
+<!ENTITY torbutton.prefs.cookie_jars "在受保护的jar文件中保存非 Tor 下 cookies">
+<!ENTITY torbutton.prefs.mmm_cookies "我要自己手动管理我的 cookies (危险)">
+<!ENTITY torbutton.prefs.clear_cookies "切换 Tor 时清除 cookies">
+<!ENTITY torbutton.prefs.disable_plugins "使用 Tor 时禁用插件(重要)">
 <!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁用更新(重要)">
+<!ENTITY torbutton.prefs.set_uagent "使用 Tor 时设置 user-agent (重要)">
+<!ENTITY torbutton.prefs.dynamic "动态内容">
 <!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.cache "缓存">
+<!ENTITY torbutton.prefs.history "历史">
+<!ENTITY torbutton.prefs.no_search "使用 Tor 时禁用搜索建议(推荐)">
+<!ENTITY torbutton.prefs.shutdown "关闭">
+<!ENTITY torbutton.prefs.tor_shutdown "关闭启用 Tor 的浏览器时清除 Tor cookies">
+<!ENTITY torbutton.prefs.all_shutdown "关闭任意浏览器时清除 cookies">
+<!ENTITY torbutton.prefs.no_shutdown "关闭时不清除 cookies">
+<!ENTITY torbutton.prefs.disable_sessionstore "禁用进程保存(推荐)">
 <!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.spoof_english "欺骗英文浏览器">
+<!ENTITY torbutton.prefs.disable_referer "使用 Tor 时不发送引用(Referer)信息(将影响小部分站点的功能)">
+<!ENTITY torbutton.prefs.disable_domstorage "使用 Tor 时禁止储存 DOM (重要)">
+<!ENTITY torbutton.prefs.forms "表单">
+<!ENTITY torbutton.prefs.block_tforms "使用 Tor 时禁用密码保存(推荐)">
+<!ENTITY torbutton.prefs.block_ntforms "未使用 Tor 时禁用密码保存(可选)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore 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 (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.non_tor "禁用 Tor 时">
+<!ENTITY torbutton.prefs.restore_tor "崩溃后恢复保存的进程:">
+<!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 认证进程(推荐)">
 <!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle "使用 Tor 时调整窗口大小为 50 像素倍数(推荐)">
+<!ENTITY torbutton.prefs.close_tor "切换 Tor 时关闭所有使用 Tor 的窗口和标签(可选)">
+<!ENTITY torbutton.prefs.close_nontor "切换 Tor 时关闭所有未使用 Tor 的窗口和标签(可选)">
+<!ENTITY torbutton.prefs.block_links "禁止在不同 Tor 状态间打开链接或刷新页面(可选)">
+<!ENTITY torbutton.prefs.jar_certs "存储 SSL 证书到单独的 Tor/非 Tor jar(推荐)">
+<!ENTITY torbutton.prefs.jar_ca_certs "存储 CA 证书到单独的 Tor/非 Tor jar(推荐)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2009-03-10 01:04:23 UTC (rev 18834)
@@ -1,16 +1,16 @@
-torbutton.button.tooltip.disabled = 使用 Tor
+torbutton.button.tooltip.disabled = 启用 Tor
 torbutton.button.tooltip.enabled = 禁用 Tor
-torbutton.panel.tooltip.disabled = 点击使用 Tor
+torbutton.panel.tooltip.disabled = 点击启用 Tor
 torbutton.panel.tooltip.enabled = 点击禁用 Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = 点击启用插件
+torbutton.panel.plugins.enabled = 点击禁用插件
 torbutton.panel.label.disabled = Tor 被禁用
-torbutton.panel.label.enabled = Tor 使用中
-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.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?
+torbutton.panel.label.enabled = Tor 运行中
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton 提供一个按钮来方便的启用或禁用 Tor 代理
+torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+torbutton.popup.plugin.warning = Torbutton 直接阻止了 Tor 加载插件内容.\n\n使用另存为代替.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton 注意：看起来你没有自定义的CA(安全证书根机构)。检查CA列表是一项很慢的操作，会减缓Tor的切换速度。你是不是愿意禁用孤立的CA机构呢？(如果你不知道该怎么办，点“确定”是安全的)
+torbutton.popup.ff3.warning = 警告！\n\n已知Torbutton在Firefox 3上运行时会泄漏你的失去以及实时书签。并且他对于Firefox 2也没有进行深入的关于Tor安全性以及易用性的检查。\n\n你是不是仍然愿意继续呢？
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings.

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2009-03-10 00:52:45 UTC (rev 18833)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2009-03-10 01:04:23 UTC (rev 18834)
@@ -60,10 +60,9 @@
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.restore_tor "On session restored 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)">
@@ -78,7 +77,6 @@
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
 <!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
@@ -87,3 +85,6 @@
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">