[or-cvs] r20238: {translation} Mike added new strings. Time to commit. (in translation/trunk/projects/torbutton: ar da de el en es fa fi fr hi hr it nb nl pl pt ro sl th tr uk vi zh_TW)

pootle at seul.org pootle at seul.org
Sun Aug 9 00:06:24 UTC 2009


Author: pootle
Date: 2009-08-08 20:06:23 -0400 (Sat, 08 Aug 2009)
New Revision: 20238

Modified:
   translation/trunk/projects/torbutton/ar/torbutton.dtd.po
   translation/trunk/projects/torbutton/ar/torbutton.properties.po
   translation/trunk/projects/torbutton/da/torbutton.dtd.po
   translation/trunk/projects/torbutton/de/torbutton.dtd.po
   translation/trunk/projects/torbutton/de/torbutton.properties.po
   translation/trunk/projects/torbutton/el/torbutton.dtd.po
   translation/trunk/projects/torbutton/el/torbutton.properties.po
   translation/trunk/projects/torbutton/en/torbutton.dtd.po
   translation/trunk/projects/torbutton/es/torbutton.dtd.po
   translation/trunk/projects/torbutton/es/torbutton.properties.po
   translation/trunk/projects/torbutton/fa/torbutton.dtd.po
   translation/trunk/projects/torbutton/fa/torbutton.properties.po
   translation/trunk/projects/torbutton/fi/torbutton.dtd.po
   translation/trunk/projects/torbutton/fi/torbutton.properties.po
   translation/trunk/projects/torbutton/fr/torbutton.dtd.po
   translation/trunk/projects/torbutton/fr/torbutton.properties.po
   translation/trunk/projects/torbutton/hi/torbutton.dtd.po
   translation/trunk/projects/torbutton/hr/torbutton.dtd.po
   translation/trunk/projects/torbutton/hr/torbutton.properties.po
   translation/trunk/projects/torbutton/it/torbutton.dtd.po
   translation/trunk/projects/torbutton/it/torbutton.properties.po
   translation/trunk/projects/torbutton/nb/torbutton.dtd.po
   translation/trunk/projects/torbutton/nb/torbutton.properties.po
   translation/trunk/projects/torbutton/nl/torbutton.dtd.po
   translation/trunk/projects/torbutton/nl/torbutton.properties.po
   translation/trunk/projects/torbutton/pl/torbutton.dtd.po
   translation/trunk/projects/torbutton/pl/torbutton.properties.po
   translation/trunk/projects/torbutton/pt/torbutton.dtd.po
   translation/trunk/projects/torbutton/ro/torbutton.properties.po
   translation/trunk/projects/torbutton/sl/torbutton.dtd.po
   translation/trunk/projects/torbutton/sl/torbutton.properties.po
   translation/trunk/projects/torbutton/th/torbutton.dtd.po
   translation/trunk/projects/torbutton/tr/torbutton.dtd.po
   translation/trunk/projects/torbutton/tr/torbutton.properties.po
   translation/trunk/projects/torbutton/uk/torbutton.dtd.po
   translation/trunk/projects/torbutton/vi/torbutton.dtd.po
   translation/trunk/projects/torbutton/vi/torbutton.properties.po
   translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po
Log:
Mike added new strings. Time to commit.


Modified: translation/trunk/projects/torbutton/ar/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -13,7 +13,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
 "n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/ar/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ar/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/ar/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -13,7 +13,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
 "n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/da/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/da/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/da/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/de/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/de/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/de/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/de/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/el/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/el/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,9 +1,10 @@
 # extracted from en-US/torbutton.dtd, el-GR/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: 2009-03-26 02:03+0200\n"
 "Last-Translator: Γιώργος Φιωτάκης <fiotakis at otenet.gr>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -94,8 +96,15 @@
 msgstr "Βοήθεια"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "Το Torbutton είναι ενεργοποιημένο.Αν θέλετε να αλλάξετε τις ρυθμίσεις διαμεσολαβητή, εκτός του Tor, απενεργοποιήστε το Torbutton και επιστρέψτε εδώ. Αν θέλετε να αλλάξετε τις ρυθμίσεις για τον διαμεσολαβητή Tor, χρησιμοποιήστε το παράθυρο επιλογών του Torbutton"
+msgid ""
+"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."
+msgstr ""
+"Το Torbutton είναι ενεργοποιημένο.Αν θέλετε να αλλάξετε τις ρυθμίσεις "
+"διαμεσολαβητή, εκτός του Tor, απενεργοποιήστε το Torbutton και επιστρέψτε "
+"εδώ. Αν θέλετε να αλλάξετε τις ρυθμίσεις για τον διαμεσολαβητή Tor, "
+"χρησιμοποιήστε το παράθυρο επιλογών του Torbutton"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -191,8 +200,8 @@
 "Απομόνωση δυναμικού περιεχόμενου ανά κατάσταση λειτουργίας Tor (κρίσιμο)"
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
-msgstr "Απενεργοποίηση ενημερώσεων κατά τη χρήση Tor (συνιστάται)"
+msgid "Disable updates during Tor usage"
+msgstr ""
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
@@ -270,12 +279,6 @@
 msgstr ""
 "Μπλοκάρισμα αποθήκευσης κωδικών + δεδομένων φορμών εκτός Tor (προαιρετικό)"
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr ""
-"Απαγόρευση αποθήκευσης καρτελών φορτωμένων από Tor στο διαχειριστή συνεδρίας "
-"(συνιστάται)"
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr "Tor"
@@ -285,8 +288,8 @@
 msgstr "Χωρίς Tor"
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
-msgstr "Μετά από κατάρευση, να γίνει επαναφορά συνεδρίας μέσω:"
+msgid "On session restored startup, set Tor state to:"
+msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -326,10 +329,6 @@
 "Κλείσιμο όλων των παραθύρων και των καρτελών χωρίς Tor κατά την εναλλαγή "
 "λειτουργίας (προαιρετικό)"
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr "Απαγόρευση πρόσβασης στο δίκτυο από url μορφής file:// (συνιστάται)"
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
@@ -347,3 +346,84 @@
 msgstr ""
 "Αποθήκευση πιστοποιητικών CA σε ξεχωριστά αρχεία jar για χρήση με Tor/χωρίς "
 "Tor (συνιστάται)"
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+#, fuzzy
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr "Απαγόρευση πρόσβασης στο δίκτυο από url μορφής file:// (συνιστάται)"
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""
+
+#~ msgid "Disable updates during Tor usage (recommended)"
+#~ msgstr "Απενεργοποίηση ενημερώσεων κατά τη χρήση Tor (συνιστάται)"
+
+#~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
+#~ msgstr ""
+#~ "Απαγόρευση αποθήκευσης καρτελών φορτωμένων από Tor στο διαχειριστή συνεδρίας "
+#~ "(συνιστάται)"
+
+#~ msgid "After a crash, restore saved session via:"
+#~ msgstr "Μετά από κατάρευση, να γίνει επαναφορά συνεδρίας μέσω:"

Modified: translation/trunk/projects/torbutton/el/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/el/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,9 +1,10 @@
 # extracted from en-US/torbutton.properties, el-GR/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: 2009-03-26 02:07+0200\n"
 "Last-Translator: Γιώργος Φιωτάκης <fiotakis at otenet.gr>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -46,20 +48,21 @@
 msgstr "Το Tor είναι ενεργοποιημένο"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
-msgstr "Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης του Firefox στον διαμεσολαβητή Tor"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
+msgstr ""
+"Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης "
+"του Firefox στον διαμεσολαβητή Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
-"Το Torbutton μπλοκάρισε τη διαχείριση αλλαγμένης κατάστασης του ιστορικού.\n"
-"\n"
-"Δείτε τις ρυθμίσεις ιστορικού για να την επιτρέψετε.\n"
-"\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -75,7 +78,11 @@
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 "Σημείωση Torbutton: Φαίνεται πως δεν διαθέτετε προσαρμοζμένες αρχές "
 "πιστοποίησης (CA) Ο έλεγχος της λίστας αρχών πιστοποίησης είναι χρονοβόρα "
@@ -87,14 +94,81 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
-"Προειδοποίηση\n"
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Το Torbutton είναι γνωστό πως διαρρέει τη ζώνη ώρας και τους δυναμικούς "
-"σελιδοδείκτες όταν χρησιμοποιείται ο Tor στον Firefox 3. Επιπρόσθετα, δεν "
-"έχει ελεγχθεί εκτεταμένα η λειτουργία του όπως έχει γίνει με τον Firefox 2.\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
 "\n"
-"Θέλετε να συνεχίσετε;"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""
+
+#~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation.\n"
+#~ "\n"
+#~ "See history settings to allow.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Το Torbutton μπλοκάρισε τη διαχείριση αλλαγμένης κατάστασης του ιστορικού.\n"
+#~ "\n"
+#~ "Δείτε τις ρυθμίσεις ιστορικού για να την επιτρέψετε.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Torbutton 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"
+#~ "\n"
+#~ "Do you wish to continue anyway?"
+#~ msgstr ""
+#~ "Προειδοποίηση\n"
+#~ "\n"
+#~ "Το Torbutton είναι γνωστό πως διαρρέει τη ζώνη ώρας και τους δυναμικούς "
+#~ "σελιδοδείκτες όταν χρησιμοποιείται ο Tor στον Firefox 3. Επιπρόσθετα, δεν "
+#~ "έχει ελεγχθεί εκτεταμένα η λειτουργία του όπως έχει γίνει με τον Firefox 2.\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"

Modified: translation/trunk/projects/torbutton/en/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/en/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/en/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/es/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/es/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -100,7 +100,11 @@
 "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."
-msgstr "Torbutton está actualmente activado.  Si desea cambiar la configuración de su proxy (no Tor), desactive Torbutton y regrese a este diálogo.  Si desea cambiar la configuración de Tor, use la ventana de preferencias de Torbutton."
+msgstr ""
+"Torbutton está actualmente activado.  Si desea cambiar la configuración de "
+"su proxy (no Tor), desactive Torbutton y regrese a este diálogo.  Si desea "
+"cambiar la configuración de Tor, use la ventana de preferencias de "
+"Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -160,7 +164,8 @@
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
-msgstr "Bloquear el caché de disco de Tor y limpiarlo al cambiar el estado de Tor"
+msgstr ""
+"Bloquear el caché de disco de Tor y limpiarlo al cambiar el estado de Tor"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
@@ -216,7 +221,9 @@
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr "Deshabilitar las sugerencias de búsqueda mientras Tor está activado (recomendado)"
+msgstr ""
+"Deshabilitar las sugerencias de búsqueda mientras Tor está activado "
+"(recomendado)"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
@@ -248,7 +255,9 @@
 
 #: torbutton.prefs.disable_referer
 msgid "Don't send referer during Tor usage (may break some sites)"
-msgstr "No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos sitios web)"
+msgstr ""
+"No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos "
+"sitios web)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -260,11 +269,15 @@
 
 #: torbutton.prefs.block_tforms
 msgid "Block password+form saving during Tor (recommended)"
-msgstr "Bloquear el almacenamiento de contraseñas y formularios al usar Tor (recomendado)"
+msgstr ""
+"Bloquear el almacenamiento de contraseñas y formularios al usar Tor "
+"(recomendado)"
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
-msgstr "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)"
+msgstr ""
+"Bloquear el almacenamiento de contraseñas y formularios al no usar Tor "
+"(opcional)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -276,11 +289,14 @@
 
 #: torbutton.prefs.restore_tor
 msgid "On session restored startup, set Tor state to:"
-msgstr "En el arranque de la restauración de la sesión, establezca el estado de Tor a:"
+msgstr ""
+"En el arranque de la restauración de la sesión, establezca el estado de Tor "
+"a:"
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
-msgstr "Recargar jar de cookies/eliminar cookies al fallar Firefox (recomendado)"
+msgstr ""
+"Recargar jar de cookies/eliminar cookies al fallar Firefox (recomendado)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
@@ -296,36 +312,40 @@
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr "Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor (recomendado)"
+msgstr ""
+"Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor "
+"(recomendado)"
 
-
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
 msgstr "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
-msgstr "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)"
+msgstr ""
+"Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado "
+"(opcional)"
 
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
-msgstr "Bloquear los clic en vínculos y recargas de páginas desde distintos estados de Tor (opcional)"
+msgstr ""
+"Bloquear los clic en vínculos y recargas de páginas desde distintos estados "
+"de Tor (opcional)"
 
-
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Guardar certificados SSL en jarras separadas para Tor/No Tor (recomendado)"
+msgstr ""
+"Guardar certificados SSL en jarras separadas para Tor/No Tor (recomendado)"
 
-
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Guardar certificados CA en jarras separadas para Tor/No Tor (recomendado)"
+msgstr ""
+"Guardar certificados CA en jarras separadas para Tor/No Tor (recomendado)"
 
-
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
-msgstr "Deshabilitar el botón y las teclas directas para evitar cambios accidentales"
+msgstr ""
+"Deshabilitar el botón y las teclas directas para evitar cambios accidentales"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -342,12 +362,15 @@
 #: torbutton.prefs.block_tor_file_net
 #, fuzzy
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr "Bloquear el acceso de Tor a la red desde archivos en direcciones archivo:// url (recomendado)"
+msgstr ""
+"Bloquear el acceso de Tor a la red desde archivos en direcciones archivo:// "
+"url (recomendado)"
 
-
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
-msgstr "Bloquear el acceso sin Tor a la red desde archivos en direcciones archivo:// url"
+msgstr ""
+"Bloquear el acceso sin Tor a la red desde archivos en direcciones archivo:// "
+"url"
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
@@ -358,10 +381,10 @@
 msgstr "Configuración de prueba"
 
 #: torbutton.prefs.test_auto
-msgid "Test my Tor settings after the first time I toggle on every Firefox start"
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
 
-msgstr "Probar mi configuración de Tor después de la primera vez que cambie en cada inicio de Firefox"
-
 #: torbutton.prefs.disable_livemarks
 msgid "Disable livemarks updates during Tor usage"
 msgstr "Deshabilitar las marcas de actualizaciones durante el uso de Tor"
@@ -376,7 +399,8 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr "Hacer que el almacenamiento de la sesión guarde y restablezca estas pestañas"
+msgstr ""
+"Hacer que el almacenamiento de la sesión guarde y restablezca estas pestañas"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"

Modified: translation/trunk/projects/torbutton/es/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/es/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -52,17 +52,15 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton proporciona un botón para habilitar y deshabilitar el acceso al proxy Tor desde el Firefox de manera "
-"fácil."
+"Torbutton proporciona un botón para habilitar y deshabilitar el acceso al "
+"proxy Tor desde el Firefox de manera fácil."
 
 #: torbutton.popup.history.warning
 msgid ""
 "Torbutton blocked changed-state history manipulation. This is to work around "
-
-msgstr "Torbutton bloqueó la manipulación del historial de cambio de estado. Esto es para trabajar sobre"
-"un problema de seguridad del Firefox.\n"
+"a Firefox security bug.\n"
 "\n"
-"Pulse “introducer” en la caja de ubicación o abra nueva ventana o pestaña en vez de eso.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
 
@@ -98,11 +96,13 @@
 "Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
-msgstr "¡Advertencia!\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\n\n¿Desea continuar de todos modos?
+msgstr "¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona "
+"horaria y la marcas a través de Tor.\\n\\n¿Desea continuar de todos modos?\n"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
-msgstr "Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.\n. 
+msgstr "Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en "
+"efecto.\\n. \n"
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
@@ -110,19 +110,26 @@
 
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
-msgstr "¡La prueba del proxy Tor FALLÓ! Revise las preferencias de su Proxy y de Privoxy."
+msgstr ""
+"¡La prueba del proxy Tor FALLÓ! Revise las preferencias de su Proxy y de "
+"Privoxy."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
 "Are you sure you want to enable anyway?"
-msgstr "La prueba más reciente del proxy Tor no tuvo éxito al emplear el Tor.\n ¿Está seguro de que desea habilitarlo de todos modos?" 
+msgstr ""
+"La prueba más reciente del proxy Tor no tuvo éxito al emplear el Tor.\n"
+" ¿Está seguro de que desea habilitarlo de todos modos?"
+
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
-msgstr "Haga clic en Aceptar para probar las preferencias del proxy Tor. Esta prueba se hará en segundo plano. Por favor, tenga paciencia."
+msgstr ""
+"Haga clic en Aceptar para probar las preferencias del proxy Tor. Esta prueba "
+"se hará en segundo plano. Por favor, tenga paciencia."
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
@@ -133,7 +140,9 @@
 "The automatic Tor proxy test failed to use Tor.\n"
 "\n"
 "Are you sure you want to enable anyway?"
-msgstr "Las prueba automática del proxy Tor no pudo usar el Tor.\n ¿Está seguro de que desea habilitarlo de todos modos?"
+msgstr ""
+"Las prueba automática del proxy Tor no pudo usar el Tor.\n"
+" ¿Está seguro de que desea habilitarlo de todos modos?"
 
 #: torbutton.prefs.recommended
 msgid "(recommended)"
@@ -146,30 +155,3 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(crucial)"
-
-#~ msgid ""
-#~ "Torbutton blocked changed-state history manipulation.\n"
-#~ "\n"
-#~ "See history settings to allow.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Torbutton bloqueó un intento de manipulación del historial.\n"
-#~ "\n"
-#~ "Vea las preferencias del historial para permitirlo.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Warning!\n"
-#~ "\n"
-#~ "Torbutton 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"
-#~ "\n"
-#~ "Do you wish to continue anyway?"
-#~ msgstr ""
-#~ "¡Advertencia!\n"
-#~ "\n"
-#~ "Se sabe que Torbutton en Firefox 3 revela su zona horaria y los "
-#~ "marcadores cuando se utiliza Tor. Además, no ha sido suficientemente "
-#~ "probado para la seguridad de Tor y en su empleo como en Firefox 2.\n"
-#~ "\n"
-#~ "¿Desea continuar de todas maneras?"
-

Modified: translation/trunk/projects/torbutton/fa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,10 @@
-# extracted from en-US/torbutton.dtd, fa-IR/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -95,8 +96,14 @@
 msgstr "کمک"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "دکمه تُر فعال هم اکنون فعال شد. اگر می خواهید تنظیمات پیشکار را که به تُر اعمال نمی شود تغییر دهید, دکمه تُر را غیرفعال کنید و به اینجا برگردید. اگر می خواهید تنظیمات تُر را تغییر دهید, پنجره تنظیمات دکمه تُر را بکارببرید."
+msgid ""
+"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."
+msgstr ""
+"دکمه تُر فعال هم اکنون فعال شد. اگر می خواهید تنظیمات پیشکار را که به تُر "
+"اعمال نمی شود تغییر دهید, دکمه تُر را غیرفعال کنید و به اینجا برگردید. اگر "
+"می خواهید تنظیمات تُر را تغییر دهید, پنجره تنظیمات دکمه تُر را بکارببرید."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -187,8 +194,8 @@
 msgstr "مجزاکردن محتوی پویا وضعیت تُر (بسیار مهم)"
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
-msgstr "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)"
+msgid "Disable updates during Tor usage"
+msgstr ""
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
@@ -262,10 +269,6 @@
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr "بازداشتن ذخیره اسم رمز + فرم هنگام غیر تُر (اختیاری)"
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr "جلوگیری از ذخیره نشست بواسطه ذخیره پنجره های تُر (توصیه شده)"
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr "تُر"
@@ -275,8 +278,8 @@
 msgstr "غیرتُر"
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
-msgstr "پس از فروپاشی, بازگرداندن نشست ذخیره شده از راه:"
+msgid "On session restored startup, set Tor state to:"
+msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -306,18 +309,97 @@
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr "بستن همه پنجره های غیرتُر در ضامن (اختیاری)"
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr "بازداشتن دسترسی به شبکه از file:// نشانی های وب (توصیه شده)"
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
-msgstr "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)"
+msgstr ""
+"بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر "
+"(اختیاری)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "ذخیره کردن گواهی های SSL در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)"
+msgstr ""
+"ذخیره کردن گواهی های SSL در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "ذخیره کردن گواهی های CA در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)"
+msgstr ""
+"ذخیره کردن گواهی های CA در فایل های jar مجزا برای تُر/غیر تُر (توصیه شده)"
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+#, fuzzy
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr "بازداشتن دسترسی به شبکه از file:// نشانی های وب (توصیه شده)"
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""
+
+#~ msgid "Disable updates during Tor usage (recommended)"
+#~ msgstr "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)"
+
+#~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
+#~ msgstr "جلوگیری از ذخیره نشست بواسطه ذخیره پنجره های تُر (توصیه شده)"
+
+#~ msgid "After a crash, restore saved session via:"
+#~ msgstr "پس از فروپاشی, بازگرداندن نشست ذخیره شده از راه:"

Modified: translation/trunk/projects/torbutton/fa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fa/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fa/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,10 @@
-# extracted from en-US/torbutton.properties, fa-IR/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -47,41 +48,116 @@
 msgstr "تُر فعال شد"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
-msgstr "دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می دهد"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
+msgstr ""
+"دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می "
+"دهد"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
-msgstr "دکمه تُر مانع ازدستکاری در تاریخچه شد.\n"
-"\n"
-" مشاهده و تغییر در تنظیمات تاریخچه برای اجازه دادن اینگونه دستکاری.\n"
+msgstr ""
 
-
-
 #: torbutton.popup.plugin.warning
 msgid ""
 "Torbutton blocked direct Tor load of plugin content.\n"
 "\n"
 "Use Save-As instead.\n"
 "\n"
-msgstr "دکمه تُر مانع از نصب خودکار یک پلاگین شد.\n"
+msgstr ""
+"دکمه تُر مانع از نصب خودکار یک پلاگین شد.\n"
 "\n"
 "در عوض ذخیره با نام را بکار ببرید.\n"
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
-msgstr "یادداشت دکمه تُر: بنظر میرسد که شما دارای اسناد سفارشی نمی باشید. بازرسی لیست اسناد زمان می برد و موجب کندی عملکرد ضامن تُر می شود. آیا می خواهید جداسازی اسناد را غیرفعال کنید؟ (اگر متوجه معنی نمی شوید, بهتر است روی بسیارخوب فشار دهید)"
+msgid ""
+"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)"
+msgstr ""
+"یادداشت دکمه تُر: بنظر میرسد که شما دارای اسناد سفارشی نمی باشید. بازرسی "
+"لیست اسناد زمان می برد و موجب کندی عملکرد ضامن تُر می شود. آیا می خواهید "
+"جداسازی اسناد را غیرفعال کنید؟ (اگر متوجه معنی نمی شوید, بهتر است روی "
+"بسیارخوب فشار دهید)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
-"Warning!\n"هشدار!\n
+"Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
-msgstr "دکمه تُر در فایرفاکس 3 برای تغذیه کردن ناحیه زمان و لایومارک هنگام استفاده تُر شناخته شد. افزون بر اینکه بطور قابل توجه تست نشده برای امنیت تُر و استفاده در فایر فاکس 2.\n\nآیا می خواهید ادامه دهید؟"
\ No newline at end of file
+msgstr ""
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""
+
+#~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation.\n"
+#~ "\n"
+#~ "See history settings to allow.\n"
+#~ "\n"
+#~ msgstr "دکمه تُر مانع ازدستکاری در تاریخچه شد.\n"
+#~ "\n"
+#~ " مشاهده و تغییر در تنظیمات تاریخچه برای اجازه دادن اینگونه دستکاری.\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Torbutton 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"
+#~ "\n"
+#~ "Do you wish to continue anyway?"
+#~ msgstr "دکمه تُر در فایرفاکس 3 برای تغذیه کردن ناحیه زمان و لایومارک هنگام استفاده تُر شناخته شد. افزون بر اینکه بطور قابل توجه تست نشده برای امنیت تُر و استفاده در فایر فاکس 2.\n\nآیا می خواهید ادامه دهید؟"

Modified: translation/trunk/projects/torbutton/fi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -365,16 +365,18 @@
 msgstr ""
 
 #: torbutton.prefs.disable_livemarks
+#, fuzzy
 msgid "Disable livemarks updates during Tor usage"
-msgstr ""
+msgstr "Estä päivitykset Torin ollessa käytössä."
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"
 msgstr "Älä tallenna Tor-evästeitä levylle"
 
 #: torbutton.prefs.nontor_memory_jar
+#, fuzzy
 msgid "Do not write Non-Tor cookies to disk"
-msgstr ""
+msgstr "Älä tallenna Tor-evästeitä levylle"
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"

Modified: translation/trunk/projects/torbutton/fi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fi/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/fr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/fr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/fr/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/hi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -151,8 +151,10 @@
 msgstr ""
 
 #: torbutton.prefs.block_nthread
+#, fuzzy
 msgid "Block history reads during Non-Tor (optional)"
 msgstr ""
+"टोर चलते समय अपने ब्राउसर के इतिहास रेकार्द को बन्द करे (अतियन्त महत्वपूर्ण)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"

Modified: translation/trunk/projects/torbutton/hr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.dtd, hr-HR/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -95,8 +97,15 @@
 msgstr "Pomoć"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "Torbutton je trenutno omogućen. Ako biste željeli promijeniti Vaše ne-Tor proxy postavke, molimo Vas da onemogućite Torbutton i vratite se ovdje. Ako biste željeli promijeniti Vaše Tor postavke, molimo Vas, koristite prozor Torbutton postavki."
+msgid ""
+"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."
+msgstr ""
+"Torbutton je trenutno omogućen. Ako biste željeli promijeniti Vaše ne-Tor "
+"proxy postavke, molimo Vas da onemogućite Torbutton i vratite se ovdje. Ako "
+"biste željeli promijeniti Vaše Tor postavke, molimo Vas, koristite prozor "
+"Torbutton postavki."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -187,7 +196,7 @@
 msgstr ""
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
+msgid "Disable updates during Tor usage"
 msgstr ""
 
 #: torbutton.prefs.set_uagent
@@ -262,10 +271,6 @@
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr ""
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr ""
@@ -275,7 +280,7 @@
 msgstr ""
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
+msgid "On session restored startup, set Tor state to:"
 msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
@@ -306,10 +311,6 @@
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr ""
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr ""
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
@@ -321,3 +322,72 @@
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr ""
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/hr/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.properties, hr-HR/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -47,14 +49,19 @@
 msgstr "Tor omogućen"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
-msgstr "Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
+msgstr ""
+"Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor "
+"proxy-a"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
 
@@ -67,14 +74,66 @@
 msgstr ""
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""

Modified: translation/trunk/projects/torbutton/it/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/it/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,4 +1,5 @@
 # extracted from en-US/torbutton.dtd, it-IT/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -11,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -94,7 +96,10 @@
 msgstr "Aiuto"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
+msgid ""
+"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."
 msgstr ""
 "Torbutton è attualmente attivo.  Se vuoi cambiare la configurazione del "
 "proxy quando non usi Tor, disabilita Torbutton e torna qui.  Se vuoi "
@@ -151,7 +156,8 @@
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
-msgstr "Blocca la scrittura della cronologia quando non si usa Tor (facoltativo)"
+msgstr ""
+"Blocca la scrittura della cronologia quando non si usa Tor (facoltativo)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
@@ -194,8 +200,8 @@
 msgstr "Confina i contenuti dinamici allo stato di Tor (essenziale)"
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
-msgstr "Disablita gli aggiornamenti usando Tor (consigliato)"
+msgid "Disable updates during Tor usage"
+msgstr ""
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
@@ -251,7 +257,8 @@
 
 #: torbutton.prefs.disable_referer
 msgid "Don't send referer during Tor usage (may break some sites)"
-msgstr "Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)"
+msgstr ""
+"Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -267,12 +274,10 @@
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
-msgstr "Blocca il salvataggio di password nei moduli quando non si usa Tor (facoltativo)"
+msgstr ""
+"Blocca il salvataggio di password nei moduli quando non si usa Tor "
+"(facoltativo)"
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr "Impedisci il salvataggio di schede aperte con Tor in una sessione (consigliato)"
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr "Tor"
@@ -282,8 +287,8 @@
 msgstr "Non-Tor"
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
-msgstr "Ripristina una sessione dopo un crash con:"
+msgid "On session restored startup, set Tor state to:"
+msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -293,7 +298,9 @@
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
-msgstr "Conserva sia i cookie Tor sia quelli Non-Tor in depositi protetti (pericoloso)"
+msgstr ""
+"Conserva sia i cookie Tor sia quelli Non-Tor in depositi protetti "
+"(pericoloso)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -319,18 +326,99 @@
 msgstr ""
 "Chiudi tutte le finestre e schede Non-Tor quando si attiva Tor (facoltativo)"
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr "Blocca l'accesso alla rete da indirizzi di tipo file:// (consigliato)"
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
-msgstr "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)"
+msgstr ""
+"Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti "
+"(facoltativo)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)"
+msgstr ""
+"Conserva i certificati SSL in depositi separati per Tor/Non-Tor "
+"(consigliato)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)"
+msgstr ""
+"Conserva i certificati delle CA in depositi separati per Tor/Non-Tor "
+"(consigliato)"
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+#, fuzzy
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr "Blocca l'accesso alla rete da indirizzi di tipo file:// (consigliato)"
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""
+
+#~ msgid "Disable updates during Tor usage (recommended)"
+#~ msgstr "Disablita gli aggiornamenti usando Tor (consigliato)"
+
+#~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
+#~ msgstr "Impedisci il salvataggio di schede aperte con Tor in una sessione (consigliato)"
+
+#~ msgid "After a crash, restore saved session via:"
+#~ msgstr "Ripristina una sessione dopo un crash con:"

Modified: translation/trunk/projects/torbutton/it/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/it/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,4 +1,5 @@
 # extracted from en-US/torbutton.properties, it-IT/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -11,7 +12,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -46,23 +48,21 @@
 msgstr "Tor attivato"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
 msgstr ""
 "L'estensione mette a disposizione un pulsante per attivare e disattivare "
 "facilmente l'uso del proxy Tor in Firefox"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
-"Torbutton ha bloccato la modifica della cronologia durante il cambio di "
-"stato. \n"
-"\n"
-"Fai 'invio' nella barra degli indirizzi o apri una nuova finestra o scheda-\n"
-"\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -77,7 +77,11 @@
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 "Avviso di Torbutton: sembra che tu non abbia delle tue proprie Certification "
 "Authority. L'esame della lista delle Certification Authority è "
@@ -89,14 +93,82 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
-"Attenzione!\n"
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Torbutton su Firefox 3 rivela il tuo fuso orario ed i tuoi livemark durante "
-"l'uso di Tor. Inoltre non è stato testato a fondo come Firefox 2 per "
-"verificare la sicurezza e usabilità di Tor.\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
 "\n"
-"Vuoi continuare ugualmente?"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""
+
+#~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation.\n"
+#~ "\n"
+#~ "See history settings to allow.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton ha bloccato la modifica della cronologia durante il cambio di "
+#~ "stato. \n"
+#~ "\n"
+#~ "Fai 'invio' nella barra degli indirizzi o apri una nuova finestra o scheda-\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Torbutton 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"
+#~ "\n"
+#~ "Do you wish to continue anyway?"
+#~ msgstr ""
+#~ "Attenzione!\n"
+#~ "\n"
+#~ "Torbutton su Firefox 3 rivela il tuo fuso orario ed i tuoi livemark durante "
+#~ "l'uso di Tor. Inoltre non è stato testato a fondo come Firefox 2 per "
+#~ "verificare la sicurezza e usabilità di Tor.\n"
+#~ "\n"
+#~ "Vuoi continuare ugualmente?"

Modified: translation/trunk/projects/torbutton/nb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/nb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/nb/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/nl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.dtd, nl-NL/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -84,7 +86,9 @@
 
 #: torbutton.pref_connection.notice
 msgid "Disable Torbutton to change these settings."
-msgstr "Torbutton dient uitgeschakeld te worden om deze instellingen te kunnen wijzigen."
+msgstr ""
+"Torbutton dient uitgeschakeld te worden om deze instellingen te kunnen "
+"wijzigen."
 
 #: torbutton.pref_connection.more_info
 msgid "More information"
@@ -95,8 +99,15 @@
 msgstr "Help"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan het Torbutton Voorkeuren-venster."
+msgid ""
+"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."
+msgstr ""
+"Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde "
+"proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan "
+"hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan "
+"het Torbutton Voorkeuren-venster."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -187,7 +198,7 @@
 msgstr ""
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
+msgid "Disable updates during Tor usage"
 msgstr ""
 
 #: torbutton.prefs.set_uagent
@@ -262,10 +273,6 @@
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr ""
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr ""
@@ -275,7 +282,7 @@
 msgstr ""
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
+msgid "On session restored startup, set Tor state to:"
 msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
@@ -306,10 +313,6 @@
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr ""
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr ""
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
@@ -321,3 +324,72 @@
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr ""
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/nl/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.properties, nl-NL/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -47,14 +49,19 @@
 msgstr "Tor ingeschakeld"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
-msgstr "Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
+msgstr ""
+"Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te "
+"schakelen"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
 
@@ -67,14 +74,66 @@
 msgstr ""
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,9 +1,10 @@
 # extracted from en-US/torbutton.dtd, pl-PL/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: 2008-10-28 17:33+0000\n"
 "Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -95,8 +97,14 @@
 msgstr "Pomoc"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "Torbutton jest włączony. Jeśli chcesz zmienić inne ustawienia proxy musisz wyłączyć Torbutton i powrócić tutaj. Jeśli chcesz zmienić ustawienia proxy Tor, zrób to tutaj."
+msgid ""
+"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."
+msgstr ""
+"Torbutton jest włączony. Jeśli chcesz zmienić inne ustawienia proxy musisz "
+"wyłączyć Torbutton i powrócić tutaj. Jeśli chcesz zmienić ustawienia proxy "
+"Tor, zrób to tutaj."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -187,8 +195,8 @@
 msgstr "Izoluj treść dynamiczną (krytyczne)"
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
-msgstr "Zablokuj aktualizacje podczas używania Tora (zalecane)"
+msgid "Disable updates during Tor usage"
+msgstr ""
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
@@ -266,10 +274,6 @@
 msgstr ""
 "Blokuj zapamiętywanie haseł z formularzy gdy Tor nieaktywny (opcjonalnie)"
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr "Zapobiegaj zapisywaniu sesji z zakładkami używającymi Tora (zalecane)"
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr "Tor"
@@ -279,8 +283,8 @@
 msgstr "bez Tora"
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
-msgstr "Po nieoczekiwanym zamknięciu, odzyskaj zapisaną sesję poprzez:"
+msgid "On session restored startup, set Tor state to:"
+msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -316,10 +320,6 @@
 "Zamykaj wszystkie okna i karty nie przeglądane w trybie Tor  podczas zmiany "
 "trybu (opcjonalnie)"
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr "Blokuj dostęp do sieci z odnośników file:// (zalecane)"
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
@@ -335,3 +335,82 @@
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
 "Zapisuj certyfikaty CA w osobnych magazynach, w każdym trybie (zalecane)"
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+#, fuzzy
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr "Blokuj dostęp do sieci z odnośników file:// (zalecane)"
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""
+
+#~ msgid "Disable updates during Tor usage (recommended)"
+#~ msgstr "Zablokuj aktualizacje podczas używania Tora (zalecane)"
+
+#~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
+#~ msgstr "Zapobiegaj zapisywaniu sesji z zakładkami używającymi Tora (zalecane)"
+
+#~ msgid "After a crash, restore saved session via:"
+#~ msgstr "Po nieoczekiwanym zamknięciu, odzyskaj zapisaną sesję poprzez:"

Modified: translation/trunk/projects/torbutton/pl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/pl/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,9 +1,10 @@
 # extracted from en-US/torbutton.properties, pl-PL/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: 2008-10-27 21:40+0000\n"
 "Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -47,20 +49,19 @@
 msgstr "Tor włączony"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
 msgstr "Rozszerzenie posiada przycisk do łatwego włączania/wyłączania proxy Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
-"Torbutton zablokował niebezpieczną dla anonimowości operację na historii.\n"
-"\n"
-"Zobacz Ustawienia historii aby zmienić to ustawienie.\n"
-"\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -75,7 +76,11 @@
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 "Informacja Torbutton: Wygląda na to, że nie posiadasz dodatkowych wpisów "
 "Ośrodków Certyfikujących. Posiadanie takiej listy spowalnia przełączanie "
@@ -86,14 +91,81 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
-"Ostrzeżenie!\n"
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Torbutton 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"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
 "\n"
-"Czy pomimo tego chcesz kontynuować?"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""
+
+#~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation.\n"
+#~ "\n"
+#~ "See history settings to allow.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton zablokował niebezpieczną dla anonimowości operację na historii.\n"
+#~ "\n"
+#~ "Zobacz Ustawienia historii aby zmienić to ustawienie.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Torbutton 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"
+#~ "\n"
+#~ "Do you wish to continue anyway?"
+#~ msgstr ""
+#~ "Ostrzeżenie!\n"
+#~ "\n"
+#~ "Torbutton 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"
+#~ "\n"
+#~ "Czy pomimo tego chcesz kontynuować?"

Modified: translation/trunk/projects/torbutton/pt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -388,8 +388,9 @@
 msgstr ""
 
 #: torbutton.prefs.disable_livemarks
+#, fuzzy
 msgid "Disable livemarks updates during Tor usage"
-msgstr ""
+msgstr "Desactivar actualizações durante a utilização do Tor"
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"

Modified: translation/trunk/projects/torbutton/ro/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ro/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/ro/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
@@ -99,11 +99,15 @@
 msgstr "Testul proxy Tor EŞUAT! Verificaţi setările proxy şi Privoxy."
 
 #: torbutton.popup.test.confirm_toggle
+#, fuzzy
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
 "Are you sure you want to enable anyway?"
 msgstr ""
+"Testul automat pentru proxy Tor a eşuat la folosirea Tor.\n"
+"\n"
+"Sunteţi sigur că vreţi să permiteţi oricum?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""

Modified: translation/trunk/projects/torbutton/sl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.dtd, sl-SI/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
@@ -44,7 +46,9 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "Uporabi priporočene nastavitve posredniškega strežnika za mojo različico Firefoxa"
+msgstr ""
+"Uporabi priporočene nastavitve posredniškega strežnika za mojo različico "
+"Firefoxa"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
@@ -95,8 +99,15 @@
 msgstr "Pomoč"
 
 #: torbutton.pref_connection_more_info.text
-msgid "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."
-msgstr "Razširitev Torbutton je trenutno omogočena. Če želite spremeniti nastavitve ne-Tor posredniškega strežnika (proxy), razširitev Torbutton najprej onemogočite, nato pa se vrnite na to mesto. Če želite spremeniti nastavitve povezave v Tor omrežje uporabite nastavitve razširitve Torbutton."
+msgid ""
+"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."
+msgstr ""
+"Razširitev Torbutton je trenutno omogočena. Če želite spremeniti nastavitve "
+"ne-Tor posredniškega strežnika (proxy), razširitev Torbutton najprej "
+"onemogočite, nato pa se vrnite na to mesto. Če želite spremeniti nastavitve "
+"povezave v Tor omrežje uporabite nastavitve razširitve Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -187,7 +198,7 @@
 msgstr ""
 
 #: torbutton.prefs.no_updates
-msgid "Disable updates during Tor usage (recommended)"
+msgid "Disable updates during Tor usage"
 msgstr ""
 
 #: torbutton.prefs.set_uagent
@@ -262,10 +273,6 @@
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
 
-#: torbutton.prefs.notor_sessionstore
-msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-msgstr ""
-
 #: torbutton.prefs.tor
 msgid "Tor"
 msgstr ""
@@ -275,7 +282,7 @@
 msgstr ""
 
 #: torbutton.prefs.restore_tor
-msgid "After a crash, restore saved session via:"
+msgid "On session restored startup, set Tor state to:"
 msgstr ""
 
 #: torbutton.prefs.reload_crashed_jar
@@ -306,10 +313,6 @@
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr ""
 
-#: torbutton.prefs.block_file_net
-msgid "Block access to network from file:// urls (recommended)"
-msgstr ""
-
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
@@ -321,3 +324,72 @@
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
+
+#: torbutton.prefs.locked_mode
+msgid "Disable Button and Hotkeys to prevent accidental toggle"
+msgstr ""
+
+#: torbutton.prefs.startup_state
+msgid "On normal startup, set Tor state to:"
+msgstr ""
+
+#: torbutton.prefs.shutdown_state
+msgid "Shutdown state"
+msgstr ""
+
+#: torbutton.prefs.startup
+msgid "Startup"
+msgstr ""
+
+#: torbutton.prefs.block_tor_file_net
+msgid "Block Tor access to network from file:// urls (recommended)"
+msgstr ""
+
+#: torbutton.prefs.block_nontor_file_net
+msgid "Block Non-Tor access to network from file:// urls"
+msgstr ""
+
+#: torbutton.prefs.restore_defaults
+msgid "Restore Defaults"
+msgstr ""
+
+#: torbutton.prefs.test_settings
+msgid "Test Settings"
+msgstr ""
+
+#: torbutton.prefs.test_auto
+msgid ""
+"Test my Tor settings after the first time I toggle on every Firefox start"
+msgstr ""
+
+#: torbutton.prefs.disable_livemarks
+msgid "Disable livemarks updates during Tor usage"
+msgstr ""
+
+#: torbutton.prefs.tor_memory_jar
+msgid "Do not write Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.nontor_memory_jar
+msgid "Do not write Non-Tor cookies to disk"
+msgstr ""
+
+#: torbutton.prefs.session_restore
+msgid "Have the session store save and restore these tabs:"
+msgstr ""
+
+#: torbutton.prefs.nontor_tabs
+msgid "Tabs loaded in Non-Tor"
+msgstr ""
+
+#: torbutton.prefs.tor_tabs
+msgid "Tabs loaded in Tor"
+msgstr ""
+
+#: torbutton.prefs.socks_vfour
+msgid "SOCKS v4"
+msgstr ""
+
+#: torbutton.prefs.socks_vfive
+msgid "SOCKS v5"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/sl/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,10 +1,11 @@
 # extracted from en-US/torbutton.properties, sl-SI/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-08 20:08+0200\n"
+"POT-Creation-Date: 2009-03-13 16:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,7 +13,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
@@ -47,14 +49,19 @@
 msgstr "Anonimizacija vključena"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
-msgid "Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy"
-msgstr "Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave preko anonimizacijskega omrežja Tor"
+msgid ""
+"Torbutton provides a button to easily enable or disable pointing Firefox to "
+"the Tor proxy"
+msgstr ""
+"Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave "
+"preko anonimizacijskega omrežja Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation.\n"
+"Torbutton blocked changed-state history manipulation. This is to work around "
+"a Firefox security bug.\n"
 "\n"
-"See history settings to allow.\n"
+"Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
 
@@ -67,14 +74,66 @@
 msgstr ""
 
 #: torbutton.popup.confirm_ca_certs
-msgid "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)"
+msgid ""
+"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)"
 msgstr ""
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton 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"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+
+#: torbutton.popup.toggle.warning
+msgid "You need to toggle Tor or restart for your settings to take effect."
+msgstr ""
+
+#: torbutton.popup.test.success
+msgid "Tor proxy test successful!"
+msgstr ""
+
+#: torbutton.popup.test.failure
+msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgstr ""
+
+#: torbutton.popup.test.confirm_toggle
+msgid ""
+"The most recent Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.popup.test.ff3_notice
+msgid ""
+"Click OK to test Tor proxy settings. This test will happen in the "
+"background. Please be patient."
+msgstr ""
+
+#: torbutton.panel.label.verified
+msgid "Tor Verified"
+msgstr ""
+
+#: torbutton.popup.test.auto_failed
+msgid ""
+"The automatic Tor proxy test failed to use Tor.\n"
+"\n"
+"Are you sure you want to enable anyway?"
+msgstr ""
+
+#: torbutton.prefs.recommended
+msgid "(recommended)"
+msgstr ""
+
+#: torbutton.prefs.optional
+msgid "(optional)"
+msgstr ""
+
+#: torbutton.prefs.crucial
+msgid "(crucial)"
+msgstr ""

Modified: translation/trunk/projects/torbutton/th/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/th/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/th/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/tr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,4 +1,5 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

Modified: translation/trunk/projects/torbutton/tr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/tr/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -1,4 +1,5 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from ../src/chrome/locale/en-US/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -10,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/uk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -362,8 +362,9 @@
 msgstr ""
 
 #: torbutton.prefs.disable_livemarks
+#, fuzzy
 msgid "Disable livemarks updates during Tor usage"
-msgstr ""
+msgstr "Не дозволяти оновлень при використанні Tor"
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"

Modified: translation/trunk/projects/torbutton/vi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title

Modified: translation/trunk/projects/torbutton/vi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.properties.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/vi/torbutton.properties.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -11,7 +11,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2009-08-08 23:58:17 UTC (rev 20237)
+++ translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2009-08-09 00:06:23 UTC (rev 20238)
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -253,8 +253,9 @@
 msgstr ""
 
 #: torbutton.prefs.disable_domstorage
+#, fuzzy
 msgid "Disable DOM Storage during Tor usage (crucial)"
-msgstr ""
+msgstr "使用Tor時暫停plugins啟動 (嚴格的)"
 
 #: torbutton.prefs.forms
 msgid "Forms"



More information about the tor-commits mailing list