tor-commits September 2013

tor-commits@lists.torproject.org

17 participants
1101 discussions

[tor/master] Fix benchmarks to run without crashing.
by nickm＠torproject.org 19 Sep '13

19 Sep '13

commit 2f2fa7683d768ce165e9fc5b6f22d2fdcd79d9ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 21:42:38 2013 -0400 Fix benchmarks to run without crashing. I broke this when I added separate test-mode support by having the benchmarks get built with TEST_CFLAGS. --- src/test/bench.c | 2 -- src/test/include.am | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/test/bench.c b/src/test/bench.c index ca01d3c..e650569 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -14,8 +14,6 @@ const char tor_git_revision[] = ""; #include "orconfig.h" -#define RELAY_PRIVATE - #include "or.h" #include "onion_tap.h" #include "relay.h" diff --git a/src/test/include.am b/src/test/include.am index e3f2795..54adc40 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -45,8 +45,6 @@ src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) src_test_bench_SOURCES = \ src/test/bench.c -src_test_bench_CPPFLAGS= $(src_test_AM_CPPFLAGS) - src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit a94b5a5f5834d2cb5d82dff02233856197317f89 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 00:46:13 2013 +0000 Update translations for tails-greeter_completed --- sl/sl.po | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/sl/sl.po b/sl/sl.po new file mode 100644 index 0000000..1e2dcaf --- /dev/null +++ b/sl/sl.po @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Martin Srebotnjak <miles(a)filmsi.net>, 2013 +# ajitam <matija(a)srebrni-galeb.si>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-09-19 00:40+0000\n" +"Last-Translator: ajitam <matija(a)srebrni-galeb.si>\n" +"Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Naprej" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "Prijava" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Dobrodošli v Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "Trajna namestitev?" + +#: ../glade/persistencewindow.glade.h:5 +msgid "Yes" +msgstr "Da" + +#: ../glade/persistencewindow.glade.h:6 +msgid "No" +msgstr "Ne" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Passphrase:" +msgstr "Geslo:" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Read-Only?" +msgstr "Samo za branje?" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "Napačno geslo. Poizkusite ponovno." + +#: ../glade/persistencewindow.glade.h:10 +msgid "More options?" +msgstr "Dodatne možnosti?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Geslo upravitelja" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Če se želite lotiti upraviteljskih opravil, vnesite upraviteljsko geslo.⏎\nSicer bo slednje zavoljo večje varnosti onemogočeno." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Geslo:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Ponoven vnos gesla:" + +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "Gesli se ne ujemata" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows Camouflage" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "S to možnostjo je Tails videti bolj podoben Microsoft Windows XP. To je lahko uporabno na javnih mestih, da ni videti sumljivo." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Aktiviraj Microsoft Windows XP Camouflage" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Jezik" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Krajevne nastavitve" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Postavitev" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Drugo ..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit 8851af45a258ced59811e60fbcd50271823a8527 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 00:46:10 2013 +0000 Update translations for tails-greeter --- sl/sl.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sl/sl.po b/sl/sl.po index 605c520..1e2dcaf 100644 --- a/sl/sl.po +++ b/sl/sl.po @@ -4,13 +4,14 @@ # # Translators: # Martin Srebotnjak <miles(a)filmsi.net>, 2013 +# ajitam <matija(a)srebrni-galeb.si>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-08-16 08:20+0000\n" -"Last-Translator: Martin Srebotnjak <miles(a)filmsi.net>\n" +"PO-Revision-Date: 2013-09-19 00:40+0000\n" +"Last-Translator: ajitam <matija(a)srebrni-galeb.si>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "Dobrodošli v Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Trajna namestitev?" #: ../glade/persistencewindow.glade.h:5 msgid "Yes" @@ -44,7 +45,7 @@ msgstr "Ne" #: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" -msgstr "" +msgstr "Geslo:" #: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" @@ -52,7 +53,7 @@ msgstr "Samo za branje?" #: ../glade/persistencewindow.glade.h:9 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "Napačno geslo. Poizkusite ponovno." #: ../glade/persistencewindow.glade.h:10 msgid "More options?"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit ddecdf3ece4d74f4723dd653836ac7eef1e03338 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 00:46:04 2013 +0000 Update translations for tails-persistence-setup --- sl/sl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sl/sl.po b/sl/sl.po index 591dab7..a6a72a3 100644 --- a/sl/sl.po +++ b/sl/sl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-08-01 16:49+0200\n" -"PO-Revision-Date: 2013-08-02 08:38+0000\n" +"POT-Creation-Date: 2013-09-09 11:27+0200\n" +"PO-Revision-Date: 2013-09-19 00:40+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Geslo:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:"

1 0

[tor-launcher/master] Update strings from transifex.
by mikeperry＠torproject.org 18 Sep '13

18 Sep '13

commit 0ac2c1f3007f44fc3d901cbfef48bafa28dd3505 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 18 14:56:29 2013 -0700 Update strings from transifex. --- src/chrome/locale/de/network-settings.dtd | 23 ++++++++------- src/chrome/locale/de/torlauncher.properties | 11 +++---- src/chrome/locale/es/network-settings.dtd | 5 ++-- src/chrome/locale/es/torlauncher.properties | 1 + src/chrome/locale/fa/network-settings.dtd | 7 +++-- src/chrome/locale/fa/torlauncher.properties | 3 +- src/chrome/locale/fr/network-settings.dtd | 5 ++-- src/chrome/locale/fr/torlauncher.properties | 1 + src/chrome/locale/it/network-settings.dtd | 5 ++-- src/chrome/locale/it/torlauncher.properties | 1 + src/chrome/locale/ko/network-settings.dtd | 1 + src/chrome/locale/ko/torlauncher.properties | 1 + src/chrome/locale/nl/network-settings.dtd | 5 ++-- src/chrome/locale/nl/torlauncher.properties | 1 + src/chrome/locale/pl/network-settings.dtd | 5 ++-- src/chrome/locale/pl/torlauncher.properties | 1 + src/chrome/locale/pt/network-settings.dtd | 3 +- src/chrome/locale/pt/progress.dtd | 4 +-- src/chrome/locale/pt/torlauncher.properties | 37 ++++++++++++------------ src/chrome/locale/ru/network-settings.dtd | 5 ++-- src/chrome/locale/ru/torlauncher.properties | 1 + src/chrome/locale/vi/network-settings.dtd | 1 + src/chrome/locale/vi/torlauncher.properties | 1 + src/chrome/locale/zh-CN/network-settings.dtd | 5 ++-- src/chrome/locale/zh-CN/torlauncher.properties | 1 + 25 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 4cafd51..8c16bdc 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -7,7 +7,7 @@ <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nein"> -<!ENTITY torSettings.firstQuestion "Welches der nachfolgenden beschreibt ihre Situation am besten?"> +<!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?"> <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Computers ist zensiert, gefiltert oder benötigt einen Proxy."> <!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren."> <!ENTITY torSettings.configure "Konfiguriere"> @@ -15,27 +15,28 @@ <!ENTITY torSettings.connectPrompt2 "Ich würde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen."> <!ENTITY torSettings.connect "Verbinde"> -<!ENTITY torSettings.proxyQuestion "Benötigt dieser Computer ein Proxy um eine Verbindung zum Internet herzustellen?"> +<!ENTITY torSettings.proxyQuestion "Benötigt dieser Computer einen Proxy um eine Verbindung zum Internet herzustellen?">  <!ENTITY torSettings.proxyHelp "Wenn Sie sich nicht sicher sind, dann schauen Sie in die Einstellungen ihres normalen Browsers ob dort ein Proxy eingerichtet ist."> <!ENTITY torSettings.enterProxy "Proxyeinstellungen eingeben."> <!ENTITY torSettings.firewallQuestion "Geht die Internetverbindung dieses Computers durch eine Firewall, die nur Verbindungen zu bestimmten Ports zulässt?"> <!ENTITY torSettings.firewallHelp "Wenn Sie sich nicht sicher sind, wählen Sie Nein. Wenn Sie dann Probleme haben eine Verbindung zum Tor-Netzwerk herzustellen, ändern Sie diese Einstellung."> <!ENTITY torSettings.enterFirewall "Geben Sie hier die Ports ein, die von der Firewall erlaubt werden. Trennen Sie die Ports jeweils mit einem Komma."> -<!ENTITY torSettings.bridgeQuestion "Sollte die Internetverbindung dieses Computers Zensiert werden, dann müssen Sie Bridge-Relais benutzen.&#160; Falls nicht klicken Sie einfach auf Verbinden."> +<!ENTITY torSettings.bridgeQuestion "Sollte die Internetverbindung dieses Computers zensiert werden, dann müssen Sie Bridge-Relays benutzen.&#160; Falls nicht, klicken Sie einfach auf Verbinden.">  <!ENTITY torsettings.startingTor "Warte auf den Start von Tor …"> +<!ENTITY torsettings.restart "Neustart"> <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "Dieser Computer benötigt ein Proxy, um sich mit dem Internet zu verbinden"> +<!ENTITY torsettings.useProxy.checkbox "Dieser Computer benötigt einen Proxy, um sich mit dem Internet zu verbinden"> <!ENTITY torsettings.useProxy.type "Proxy-Typ:"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Nutzername:"> <!ENTITY torsettings.useProxy.password "Passwort:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> @@ -43,12 +44,12 @@ <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Computers geht durch eine Firewall, die nur bestimmte Ports zulässt"> <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Ports:"> <!ENTITY torsettings.useBridges.checkbox "Mein Internet Service Provider (ISP) blockiert Verbindungen zum Tor-Netzwerk"> -<!ENTITY torsettings.useBridges.label "Eine oder mehrere Bridges im Format Adresse:Port hinzufügen."> -<!ENTITY torsettings.useBridges.placeholder "Adresse:Port"> +<!ENTITY torsettings.useBridges.label "Geben Sie ein oder mehrere Bridge-Relais an (eins pro Zeile)."> +<!ENTITY torsettings.useBridges.placeholder "Adresse:Port ODER Transportadresse:Port"> <!ENTITY torsettings.copyLog "Tor-Log in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zu Bridge-Relays"> -<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich das ihr ISP oder eine andere Organisation Tor blockiert.&#160; Dieses Problem kann meist mit der benutzung von Bridge-Relais, die versteckt und damit schwerer zu blocken sind, umgangen werden."> -<!ENTITY torsettings.bridgeHelp2 "Um einige Bridge-Relays zu erhalten, besuchen Sie mit dem Browser folgende Seite: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "Eine andere Möglichkeit an Bridge-Relais zu kommen, ist eine Email mit dem inhalt 'get bridges' and bridges(a)torproject.org zu schicken.&#160; Allerdings muss diese Email, um es potentiellen angreifern schwerer zu machen, von einer der folgenden Adressen geschickt werden: gmail.com oder yahoo.com"> -<!ENTITY torsettings.bridgeHelp4 "Bridge-Relais können auch mithilfe einer Email an help(a)rt.torproject.org angefordert werden."> +<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich dass Ihr ISP oder eine andere Organisation Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von Bridge-Relays umgangen werden, die versteckt und damit schwerer zu blocken sind."> +<!ENTITY torsettings.bridgeHelp2 "Um einige Bridge-Relays zu erhalten, besuchen Sie mit einem Web-Browser folgende Seite: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Eine andere Möglichkeit an Bridge-Relays zu kommen ist, eine Email mit dem Inhalt 'get bridges' an bridges(a)torproject.org zu schicken.&#160; Allerdings muss diese Email, um es potentiellen Angreifern schwerer zu machen, von einer der folgenden Domains aus geschickt werden: gmail.com oder yahoo.com"> +<!ENTITY torsettings.bridgeHelp4 "Bridge-Relays können auch mit Hilfe einer Email an help(a)rt.torproject.org angefordert werden."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 2c1113a..4eb5d93 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wurde unerwartet geschlossen. +torlauncher.please_restart_app=Bitte starten Sie das Programm neu torlauncher.tor_controlconn_failed=Konnte keine Verbindung zum Tor Kontroll-Port herstellen. torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen. torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen.\n\n%S @@ -16,15 +17,15 @@ torlauncher.password_hash_missing=Konnte kein gehashtes Passwort bekommen. torlauncher.failed_to_get_settings=Die Tor-Einstellungen können nicht abgefragt werden.\n\n%S torlauncher.failed_to_save_settings=Die Tor-Einstellungen können nicht gespeichert werden.\n\n%S -torlauncher.ensure_tor_is_running=Bitte stelle sicher, dass Tor läuft. +torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor läuft. -torlauncher.error_proxy_addr_missing=Um ein Proxy mit Tor zu verwenden, muss eine IP-Adresse oder ein Hostname und eine Portnummer angegeben werden. +torlauncher.error_proxy_addr_missing=Um einen Proxy mit Tor zu verwenden, muss eine IP-Adresse oder ein Hostname und eine Portnummer angegeben werden. torlauncher.error_proxy_type_missing=Der Proxy-Typ muss ausgewählt werden. torlauncher.error_bridges_missing=Eine oder mehrere Bridges müssen angegeben werden torlauncher.connect=Verbinden -torlauncher.quit=Beenden -torlauncher.quit_win=Exit +torlauncher.quit=Schließen +torlauncher.quit_win=Beenden torlauncher.done=Fertig -torlauncher.forAssistance=Falls Sie hilfe benötigen kontaktieren sie %S +torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index a573b1b..2ca7d03 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Esperando a que Tor arranque..."> +<!ENTITY torsettings.restart "Reiniciar"> <!ENTITY torsettings.optional "Opcional"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos ('firewall') que sólo permite conexiones a ciertos puertos"> <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor"> -<!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente ('bridge relays') en la forma dirección:puerto."> -<!ENTITY torsettings.useBridges.placeholder "dirección:puerto"> +<!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente ('bridge', uno por línea)."> +<!ENTITY torsettings.useBridges.placeholder "dirección:puerto O dirección:puerto de transporte"> <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')"> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 4b95de7..e236d38 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. +torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 6aed4df..c034ecf 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -10,10 +10,10 @@ <!ENTITY torSettings.firstQuestion ""> <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> +<!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.connect "اتصال"> <!ENTITY torSettings.proxyQuestion "">  @@ -27,8 +27,9 @@  <!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.restart "شروع دوباره"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "اختیاری"> <!ENTITY torsettings.useProxy.checkbox ""> <!ENTITY torsettings.useProxy.type "نوع پراکسی:"> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 79b1565..215e5b0 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S @@ -22,7 +23,7 @@ torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پ torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید. torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید. -# torlauncher.connect=Connect +torlauncher.connect=اتصال torlauncher.quit=خروج torlauncher.quit_win=خروج torlauncher.done=انجام شد diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 37e1339..b39112c 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> +<!ENTITY torsettings.restart "Redémarrer"> <!ENTITY torsettings.optional "Optionnel"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor"> -<!ENTITY torsettings.useBridges.label "Entrez un ou plusieurs bridges sous la forme « adresse:port »"> -<!ENTITY torsettings.useBridges.placeholder "adresse:port"> +<!ENTITY torsettings.useBridges.label "Saisir un ou davantage de bridges relais (un par ligne)."> +<!ENTITY torsettings.useBridges.placeholder "adresse:port OU adresse de transport:port"> <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index e77215d..6fcd0ef 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lanceur Tor torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. +torlauncher.please_restart_app=Veuillez redémarrer l'application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.\n\n%S diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index d13ddc6..d9fb22b 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> +<!ENTITY torsettings.restart "Riavvia"> <!ENTITY torsettings.optional "Facoltativo"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> -<!ENTITY torsettings.useBridges.label "Inserisci uno o più ponti relé nella forma indirizzo:porta."> -<!ENTITY torsettings.useBridges.placeholder "indirizzo:porta"> +<!ENTITY torsettings.useBridges.label ""> +<!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index c3f5cbb..2c119ac 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è arrestato inaspettatamente. +# torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor.⏎\n⏎\n%S diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 602c315..acb43ea 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.restart "프로그램 다시 시작"> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index b97e29c..e00a45a 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 267a311..c2b0357 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Aan het wachten tot Tor gestart is..."> +<!ENTITY torsettings.restart "Herstart"> <!ENTITY torsettings.optional "Optioneel"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat."> <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor netwerk"> -<!ENTITY torsettings.useBridges.label "Voer één of meerdere bridge relays in volgens het formaat adres:poort."> -<!ENTITY torsettings.useBridges.placeholder "adres:poort"> +<!ENTITY torsettings.useBridges.label ""> +<!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp"> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 2624048..31ed816 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Starter torlauncher.tor_exited=Tor is onverwacht afgesloten. +# torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. torlauncher.tor_failed_to_start=Tor kon niet starten. torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken.\n\n%S diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 1d8e9ff..7a33652 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> +<!ENTITY torsettings.restart "Restart"> <!ENTITY torsettings.optional "(opcjonalnie)"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> -<!ENTITY torsettings.useBridges.label "Wpisz jeden lub więcej adresów mostków w postaci adres:port"> -<!ENTITY torsettings.useBridges.placeholder "adres:port"> +<!ENTITY torsettings.useBridges.label ""> +<!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index af436e8..3eccc15 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. +# torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_bootstrap_failed=Błąd w ustanowieniu połączenia przez Tora.\n\n%S diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 31dbb6b..ebc79ba 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure ""> <!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.connect "Ligar"> <!ENTITY torSettings.proxyQuestion "">  @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.restart "Reiniciar"> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd index afcbe11..92136c4 100644 --- a/src/chrome/locale/pt/progress.dtd +++ b/src/chrome/locale/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "O Navegador Tor vai abrir-se assim que se estabeleça uma ligação à rede Tor."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 1bb158d..6a0f13a 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,30 +1,31 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Iniciador Tor -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_exited=O Tor fechou-se insperadamente. +# torlauncher.please_restart_app=Please restart this application. +torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. +torlauncher.tor_failed_to_start=O Tor falhou a inicialização. +torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.\n\n %S -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Impossível inicializar o Tor.\n\n %S +torlauncher.tor_missing=O executável do Tor está em falta. +torlauncher.torrc_missing=O ficheiro está em falta. +torlauncher.datadir_missing=A diretoria de dados do Tor não existe. +torlauncher.password_hash_missing=Falhou -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Incapaz de aceder as definições do Tor\n\n %S +torlauncher.failed_to_save_settings=Incapaz de gavar as definições do Tor\n\n %S +torlauncher.ensure_tor_is_running=Por favor confirme que o Tor está a correr. -torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porta para configurar o Tor a utilizar um proxy para aceder à Internet. -torlauncher.error_proxy_type_missing=Tem de seleccionar o tipo de Proxy +torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porta, para configurar o Tor para utilizar um proxy para aceder à Internet. +torlauncher.error_proxy_type_missing=Tem de seleccionar o tipo de proxy torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes. -# torlauncher.connect=Connect +torlauncher.connect=Ligar torlauncher.quit=Sair -torlauncher.quit_win=Exit +torlauncher.quit_win=Sair torlauncher.done=Completo -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Para assistência contacte %S diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 07d263f..9ee9527 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> +<!ENTITY torsettings.restart "Перезапустить"> <!ENTITY torsettings.optional "Необязательно"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам"> <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> -<!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост в виде адрес:порт."> -<!ENTITY torsettings.useBridges.placeholder "адрес:порт"> +<!ENTITY torsettings.useBridges.label ""> +<!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 9e2f66c..6b40710 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Загрузчик Tor torlauncher.tor_exited=Tor неожиданно завершился. +# torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. torlauncher.tor_bootstrap_failed=Tor не сумел установить сетевое соединение.\n\n%S diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 0fb77c8..465f35b 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.restart ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index b305043..bc206fa 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 6951b15..eaeb77f 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> +<!ENTITY torsettings.restart "重新启动"> <!ENTITY torsettings.optional "可选"> @@ -43,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> -<!ENTITY torsettings.useBridges.label "请以“地址:端口”的格式输入一个或多个网桥中继。"> -<!ENTITY torsettings.useBridges.placeholder "地址:端口"> +<!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> +<!ENTITY torsettings.useBridges.placeholder "地址:端口或 obfs 网桥地址:端口"> <!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index fe5bc7d..360801f 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor 启动器 torlauncher.tor_exited=Tor 意外退出。 +# torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 torlauncher.tor_bootstrap_failed=Tor 无法建立 Tor 网络连接。\n\n%S

1 0

[torbutton/master] Add changelog entry and bump version for 1.6.2.
by mikeperry＠torproject.org 18 Sep '13

18 Sep '13

commit 45d35d309726d9b01e00d96729041bbac91307f3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 18 12:57:23 2013 -0700 Add changelog entry and bump version for 1.6.2. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 12d3abb..20557d6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.2: + 18 Sep 2013 + * bug 9492: Fix Torbutton logo on OSX and Windows (and related + initialization code) + 1.6.1: 01 Aug 2013 * bug 8478: Change when window resizing code fires to avoid rounding errors diff --git a/src/install.rdf b/src/install.rdf index 81e89f2..a18bf7d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.1</em:version> + <em:version>1.6.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Switch to using the new git branches for translation imports.
by mikeperry＠torproject.org 18 Sep '13

18 Sep '13

commit 967800a452d79b79d10f34297e7d462fa8bb9f73 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 18 12:01:07 2013 -0700 Switch to using the new git branches for translation imports. --- trans_tools/import-translations.sh | 44 + trans_tools/mkmoz.sh | 20 - trans_tools/mkpo.sh | 20 - trans_tools/mvmoz.sh | 6 - trans_tools/new_tb_strings.sh | 20 - trans_tools/old/mkmoz.sh | 20 + trans_tools/old/mkpo.sh | 20 + trans_tools/old/mvmoz.sh | 6 + trans_tools/old/new_tb_strings.sh | 20 + trans_tools/old/validate.py | 94 + trans_tools/old/validate_all.sh | 7 + .../remove-english-placeholder-strings.diff | 2066 -------------------- trans_tools/validate.py | 94 - trans_tools/validate_all.sh | 7 - 14 files changed, 211 insertions(+), 2233 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh new file mode 100755 index 0000000..f95398e --- /dev/null +++ b/trans_tools/import-translations.sh @@ -0,0 +1,44 @@ +#!/bin/sh -e + +# This var comes from the TBB locale list. +# XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync +BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN" + +if [ -d translation ]; +then + cd translation + git fetch origin + cd .. +else + git clone https://git.torproject.org/translation.git +fi + +cd translation +for i in $BUNDLE_LOCALES +do + UL="`echo $i|tr - _`" + mkdir -p ../../src/chrome/locale/$i/ + git checkout abouttor-homepage + git merge origin/abouttor-homepage + cp $UL/aboutTor.dtd ../../src/chrome/locale/$i/ + + git checkout torbutton-torbuttondtd + git merge origin/torbutton-torbuttondtd + cp $UL/torbutton.dtd ../../src/chrome/locale/$i/ + + git checkout torbutton-branddtd + git merge origin/torbutton-branddtd + cp $UL/brand.dtd ../../src/chrome/locale/$i/ + + git checkout torbutton-torbuttonproperties + git merge origin/torbutton-torbuttonproperties + cp $UL/torbutton.properties ../../src/chrome/locale/$i/ + + git checkout torbutton-browserproperties + git merge origin/torbutton-browserproperties + cp $UL/browser.properties ../../src/chrome/locale/$i/ + + git checkout torbutton-brandproperties + git merge origin/torbutton-brandproperties + cp $UL/brand.properties ../../src/chrome/locale/$i/ +done diff --git a/trans_tools/mkmoz.sh b/trans_tools/mkmoz.sh deleted file mode 100755 index 1f2986b..0000000 --- a/trans_tools/mkmoz.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -x -# - -LOCALEDIR="../src/chrome/locale" - -poDir="po" -directories="`ls -1 ./$poDir|tr _ -`" -mozDir="moz" -input="en" -template="torbutton.dtd" - -for dir in $directories -do - pootleDir="`echo $dir|tr - _`"; - echo "$pootleDir" - mkdir -p $mozDir/$dir/ - po2moz -i $poDir/$pootleDir/ -t ${LOCALEDIR}/${input}/ -o $mozDir/$dir/ - #po2moz -i $poDir/$pootleDir/ -t pootle/templates/ -o $mozDir/$dir/ -done - diff --git a/trans_tools/mkpo.sh b/trans_tools/mkpo.sh deleted file mode 100755 index 5e06757..0000000 --- a/trans_tools/mkpo.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -x -# - -LOCALEDIR="../src/chrome/locale/" - -directories="ar de-DE es hr-HR nl-NL pt-BR sl-SI de-AT el-GR fa-IR it-IT pl-PL zh-CN de-CH fr-FR ru zh-TW" -outdir="po" -#input="en-US/torbutton.dtd" -input="en" -template="torbutton.dtd" - -for dir in $directories -do - pootleDir="`echo $dir|tr - _`"; - mkdir -p $outdir/$pootleDir/ - #moz2po -i $dir/$template -t $input -o $outdir/$pootleDir/torbutton.po - moz2po -i $LOCALEDIR/$dir/ -t $LOCALEDIR/$input/ -o $outdir/$pootleDir/ -done - - diff --git a/trans_tools/mvmoz.sh b/trans_tools/mvmoz.sh deleted file mode 100755 index 64ff436..0000000 --- a/trans_tools/mvmoz.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -for locale in `ls -1 moz/`; -do - mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/ -done diff --git a/trans_tools/new_tb_strings.sh b/trans_tools/new_tb_strings.sh deleted file mode 100755 index b0b4e30..0000000 --- a/trans_tools/new_tb_strings.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -moz2po -P -i ../src/chrome/locale/en/ -o po/templates/ - -for i in `ls -1 po` -do - msgmerge -U ./po/$i/torbutton.dtd.po ./po/templates/torbutton.dtd.pot - msgmerge -U ./po/$i/torbutton.properties.po ./po/templates/torbutton.properties.pot - msgmerge -U ./po/$i/browser.dtd.po ./po/templates/browser.dtd.pot - msgmerge -U ./po/$i/browser.properties.po ./po/templates/browser.properties.pot -done - -svn diff po -svn commit po - -cd po -tx push --source -tx push --translation -cd .. - diff --git a/trans_tools/old/mkmoz.sh b/trans_tools/old/mkmoz.sh new file mode 100755 index 0000000..1f2986b --- /dev/null +++ b/trans_tools/old/mkmoz.sh @@ -0,0 +1,20 @@ +#!/bin/bash -x +# + +LOCALEDIR="../src/chrome/locale" + +poDir="po" +directories="`ls -1 ./$poDir|tr _ -`" +mozDir="moz" +input="en" +template="torbutton.dtd" + +for dir in $directories +do + pootleDir="`echo $dir|tr - _`"; + echo "$pootleDir" + mkdir -p $mozDir/$dir/ + po2moz -i $poDir/$pootleDir/ -t ${LOCALEDIR}/${input}/ -o $mozDir/$dir/ + #po2moz -i $poDir/$pootleDir/ -t pootle/templates/ -o $mozDir/$dir/ +done + diff --git a/trans_tools/old/mkpo.sh b/trans_tools/old/mkpo.sh new file mode 100755 index 0000000..5e06757 --- /dev/null +++ b/trans_tools/old/mkpo.sh @@ -0,0 +1,20 @@ +#!/bin/bash -x +# + +LOCALEDIR="../src/chrome/locale/" + +directories="ar de-DE es hr-HR nl-NL pt-BR sl-SI de-AT el-GR fa-IR it-IT pl-PL zh-CN de-CH fr-FR ru zh-TW" +outdir="po" +#input="en-US/torbutton.dtd" +input="en" +template="torbutton.dtd" + +for dir in $directories +do + pootleDir="`echo $dir|tr - _`"; + mkdir -p $outdir/$pootleDir/ + #moz2po -i $dir/$template -t $input -o $outdir/$pootleDir/torbutton.po + moz2po -i $LOCALEDIR/$dir/ -t $LOCALEDIR/$input/ -o $outdir/$pootleDir/ +done + + diff --git a/trans_tools/old/mvmoz.sh b/trans_tools/old/mvmoz.sh new file mode 100755 index 0000000..64ff436 --- /dev/null +++ b/trans_tools/old/mvmoz.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +for locale in `ls -1 moz/`; +do + mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/ +done diff --git a/trans_tools/old/new_tb_strings.sh b/trans_tools/old/new_tb_strings.sh new file mode 100755 index 0000000..b0b4e30 --- /dev/null +++ b/trans_tools/old/new_tb_strings.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +moz2po -P -i ../src/chrome/locale/en/ -o po/templates/ + +for i in `ls -1 po` +do + msgmerge -U ./po/$i/torbutton.dtd.po ./po/templates/torbutton.dtd.pot + msgmerge -U ./po/$i/torbutton.properties.po ./po/templates/torbutton.properties.pot + msgmerge -U ./po/$i/browser.dtd.po ./po/templates/browser.dtd.pot + msgmerge -U ./po/$i/browser.properties.po ./po/templates/browser.properties.pot +done + +svn diff po +svn commit po + +cd po +tx push --source +tx push --translation +cd .. + diff --git a/trans_tools/old/validate.py b/trans_tools/old/validate.py new file mode 100755 index 0000000..179e7b0 --- /dev/null +++ b/trans_tools/old/validate.py @@ -0,0 +1,94 @@ +#!/usr/bin/python + +from __future__ import unicode_literals, print_function + +import polib +import sys +import getopt + +symbols = [ + '(', ')', '<', '>', '{', + '}', '[', ']', '\"', ';' + ] + +counts = {} + +def reset(): + for s in symbols: + counts[s] = 0 + +def parse_orig_string(string): + for ch in string: + if ch in symbols: + counts[ch] += 1 + +def parse_trans_string(string): + for ch in string: + if ch in symbols: + counts[ch] -= 1 + +def get_strings(file): + entries = [] + po = polib.pofile(file, autodetect_encoding=True) + + for entry in po: + entries.append((entry.msgid, entry.msgstr, 0)) + + return entries + +def warn(): + for s in symbols: + if counts[s] < 0: + return True + return False + +def usage(): + print("Usage: %s -i/--input=<file.po> -l/--logfile=<logfile>" % sys.argv[0]) + +def log(string, file_to_check, log_file, linenum = -1): + f = log_file + if linenum == -1: + f.write(("%s: %s\n" % (file_to_check, string)).encode("utf-8")) + else: + f.write(("%s (%s): %s\n" % (file_to_check, linenum, string)).encode("utf-8")) + #f.close() + +def check(file_to_check, log_file): + errors = 0 + + strings = get_strings(file_to_check) + for (orig, trans, linenum) in strings: + reset() + parse_orig_string(orig) + parse_trans_string(trans) + if warn(): + errors += 1 + log(trans, file_to_check, log_file, linenum) + + if errors != 0: + log("Total count of warnings %d\n" % errors, file_to_check, log_file) + +if __name__ == '__main__': + try: + opts, args = getopt.getopt(sys.argv[1:], "i:hl:", ["input=", "help", "logfile="]) + except getopt.GetoptError, err: + print(str(err)) + sys.exit(2) + + file_to_check = None + log_file = sys.stdout + + for opt, arg in opts: + if opt in ("-i", "--input"): + file_to_check = arg + elif opt in ("-h", "--help"): + usage() + sys.exit() + elif opt in ("-l", "--logfile"): + log_file = arg + + if file_to_check is None or log_file is None: + print("ERROR: You need to specify both the input and the logfile") + sys.exit(2) + + check(file_to_check, log_file) diff --git a/trans_tools/old/validate_all.sh b/trans_tools/old/validate_all.sh new file mode 100755 index 0000000..47bb6e6 --- /dev/null +++ b/trans_tools/old/validate_all.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +for i in `ls -1 ./po` +do + ./validate.py --input=./po/$i/torbutton.dtd.po + ./validate.py --input=./po/$i/torbutton.properties.po +done diff --git a/trans_tools/remove-english-placeholder-strings.diff b/trans_tools/remove-english-placeholder-strings.diff deleted file mode 100644 index 65b6b3b..0000000 --- a/trans_tools/remove-english-placeholder-strings.diff +++ /dev/null @@ -1,2066 +0,0 @@ -Index: src/chrome/locale/zh-CN/torbutton.dtd -=================================================================== ---- src/chrome/locale/zh-CN/torbutton.dtd (revision 15635) -+++ src/chrome/locale/zh-CN/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "点击初始化 Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/zh-CN/torbutton.properties -=================================================================== ---- src/chrome/locale/zh-CN/torbutton.properties (revision 15635) -+++ src/chrome/locale/zh-CN/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor 被禁用 - torbutton.panel.label.enabled = Tor 使用中 - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton 提供一个按钮来方便的使用或禁用 Tor 代理 --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/de-CH/torbutton.dtd -=================================================================== ---- src/chrome/locale/de-CH/torbutton.dtd (revision 15635) -+++ src/chrome/locale/de-CH/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/de-CH/torbutton.properties -=================================================================== ---- src/chrome/locale/de-CH/torbutton.properties (revision 15635) -+++ src/chrome/locale/de-CH/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor deaktiviert - torbutton.panel.label.enabled = Tor aktiviert - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/hr-HR/torbutton.dtd -=================================================================== ---- src/chrome/locale/hr-HR/torbutton.dtd (revision 15635) -+++ src/chrome/locale/hr-HR/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "O"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/hr-HR/torbutton.properties -=================================================================== ---- src/chrome/locale/hr-HR/torbutton.properties (revision 15635) -+++ src/chrome/locale/hr-HR/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor onemogućen - torbutton.panel.label.enabled = Tor omogućen - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/nl-NL/torbutton.dtd -=================================================================== ---- src/chrome/locale/nl-NL/torbutton.dtd (revision 15635) -+++ src/chrome/locale/nl-NL/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "O"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/nl-NL/torbutton.properties -=================================================================== ---- src/chrome/locale/nl-NL/torbutton.properties (revision 15635) -+++ src/chrome/locale/nl-NL/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor uitgeschakeld - torbutton.panel.label.enabled = Tor ingeschakeld - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/pl-PL/torbutton.dtd -=================================================================== ---- src/chrome/locale/pl-PL/torbutton.dtd (revision 15635) -+++ src/chrome/locale/pl-PL/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "T"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/pl-PL/torbutton.properties -=================================================================== ---- src/chrome/locale/pl-PL/torbutton.properties (revision 15635) -+++ src/chrome/locale/pl-PL/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor wyłączony - torbutton.panel.label.enabled = Tor włączony - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/pt-BR/torbutton.dtd -=================================================================== ---- src/chrome/locale/pt-BR/torbutton.dtd (revision 15635) -+++ src/chrome/locale/pt-BR/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/pt-BR/torbutton.properties -=================================================================== ---- src/chrome/locale/pt-BR/torbutton.properties (revision 15635) -+++ src/chrome/locale/pt-BR/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor desabilitado - torbutton.panel.label.enabled = Tor habilitado - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/it-IT/torbutton.dtd -=================================================================== ---- src/chrome/locale/it-IT/torbutton.dtd (revision 15635) -+++ src/chrome/locale/it-IT/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 40px all'attivazione (consigliato)"> - <!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor alla disattivazione (facoltativo)"> - <!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor all' attivazione (facoltativo)"> --<!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)"> - <!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)"> - <!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/it-IT/torbutton.properties -=================================================================== ---- src/chrome/locale/it-IT/torbutton.properties (revision 15635) -+++ src/chrome/locale/it-IT/torbutton.properties (working copy) -@@ -11,13 +11,13 @@ - torbutton.popup.plugin.warning = Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n - torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle tue proprie Certification Authority. L'esame della lista delle Certification Authority &grave; un'operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK) - torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 rivela il tuo fuso orario e i feed dei 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\nVuoi continuare ugualmente? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/ru/torbutton.dtd -=================================================================== ---- src/chrome/locale/ru/torbutton.dtd (revision 15635) -+++ src/chrome/locale/ru/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Масштабировать окна с множителем 40px при переключении Tor (желательно)"> - <!ENTITY torbutton.prefs.close_tor "Закрывать все окна и вкладки Tor при переключении режимов (необяз.)"> - <!ENTITY torbutton.prefs.close_nontor "Закрывать все окна и вкладки не-Tor при переключении режимов (необяз.)"> --<!ENTITY torbutton.prefs.block_links "Блокировать щелчки по ссылкам и перезагрузку страниц из разных режимов Tor (необяз.)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/ru/torbutton.properties -=================================================================== ---- src/chrome/locale/ru/torbutton.properties (revision 15635) -+++ src/chrome/locale/ru/torbutton.properties (working copy) -@@ -2,22 +2,22 @@ - torbutton.button.tooltip.enabled = Отключить Tor - torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor - torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor --torbutton.panel.plugins.disabled = Click to enable plugins --torbutton.panel.plugins.enabled = Click to disable plugins -+torbutton.panel.plugins.disabled = -+torbutton.panel.plugins.enabled = - torbutton.panel.label.disabled = Tor отключен - torbutton.panel.label.enabled = Tor включен - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Кнопка включения/отключения доступа к Интернет через сеть Tor - torbutton.popup.history.warning = Torbutton заблокировал операции с журналом.\n\nСм. настройки журнала.\n\n - torbutton.popup.plugin.warning = Torbutton заблокировал прямую установку плагинов через Tor.\n\nИспользуйте способ Сохранить как.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/en-US/torbutton.dtd -=================================================================== ---- src/chrome/locale/en-US/torbutton.dtd (revision 15635) -+++ src/chrome/locale/en-US/torbutton.dtd (working copy) -@@ -71,7 +71,6 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> - <!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> - <!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> - <!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> - <!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> - <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> -Index: src/chrome/locale/sl-SI/torbutton.dtd -=================================================================== ---- src/chrome/locale/sl-SI/torbutton.dtd (revision 15635) -+++ src/chrome/locale/sl-SI/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/sl-SI/torbutton.properties -=================================================================== ---- src/chrome/locale/sl-SI/torbutton.properties (revision 15635) -+++ src/chrome/locale/sl-SI/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Anonimizacija izključena - torbutton.panel.label.enabled = Anonimizacija vključena - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave preko anonimizacijskega omrežja Tor --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/de-AT/torbutton.dtd -=================================================================== ---- src/chrome/locale/de-AT/torbutton.dtd (revision 15635) -+++ src/chrome/locale/de-AT/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/de-AT/torbutton.properties -=================================================================== ---- src/chrome/locale/de-AT/torbutton.properties (revision 15635) -+++ src/chrome/locale/de-AT/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor deaktiviert - torbutton.panel.label.enabled = Tor aktiviert - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/fa-IR/torbutton.dtd -=================================================================== ---- src/chrome/locale/fa-IR/torbutton.dtd (revision 15635) -+++ src/chrome/locale/fa-IR/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "تغییراندازه ابعاد پنجره با مضربهای 40 تصویر دانه در ضامن (توصیه شده)"> - <!ENTITY torbutton.prefs.close_tor "بستن همه پنجره های تُر در ضامن (اختیاری)"> - <!ENTITY torbutton.prefs.close_nontor "بستن همه پنجره های غیرتُر در ضامن (اختیاری)"> --<!ENTITY torbutton.prefs.block_links "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/fa-IR/torbutton.properties -=================================================================== ---- src/chrome/locale/fa-IR/torbutton.properties (revision 15635) -+++ src/chrome/locale/fa-IR/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = تُر غیرفعال شد - torbutton.panel.label.enabled = تُر فعال شد - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می دهد --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/ar/torbutton.dtd -=================================================================== ---- src/chrome/locale/ar/torbutton.dtd (revision 15635) -+++ src/chrome/locale/ar/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "أعد تحجيم النوافذ إلى مضاعفات 50 عنصورة عند تغير الحالة (محبذ)"> - <!ENTITY torbutton.prefs.close_tor "أغلق كل نوافذ و ألسنة تور عند اغير الحالة (اختياري)"> - <!ENTITY torbutton.prefs.close_nontor "أغلق كل نوافذ و ألسنة غير تور عند اغير الحالة (اختياري)"> --<!ENTITY torbutton.prefs.block_links "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/ar/torbutton.properties -=================================================================== ---- src/chrome/locale/ar/torbutton.properties (revision 15635) -+++ src/chrome/locale/ar/torbutton.properties (working copy) -@@ -9,15 +9,15 @@ - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = يوفر زرتور زرا للتحكم بسهولة في استخدام فيرفكس لوسيط تور - torbutton.popup.history.warning = منع توربتن تعديل الحالة-المتغيرة للتأريخ.\n\nطالع تضبيطات التأريخ لتسمح بهذا.\n\n - torbutton.popup.plugin.warning = منع توربتن تحميلا مباشرا لمحتوى ملحقة.\n\nاستخدم 'احفظ باسم' بدلا عن هذا.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/el-GR/torbutton.dtd -=================================================================== ---- src/chrome/locale/el-GR/torbutton.dtd (revision 15635) -+++ src/chrome/locale/el-GR/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "Π"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκίνηση του Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/el-GR/torbutton.properties -=================================================================== ---- src/chrome/locale/el-GR/torbutton.properties (revision 15635) -+++ src/chrome/locale/el-GR/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Το Tor είναι απενεργοποιημένο - torbutton.panel.label.enabled = Το Tor είναι ενεργοποιημένο - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης του Firefox στον διαμεσολαβητή Tor --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/es/torbutton.dtd -=================================================================== ---- src/chrome/locale/es/torbutton.dtd (revision 15635) -+++ src/chrome/locale/es/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor (recomendado)"> - <!ENTITY torbutton.prefs.close_tor "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)"> - <!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)"> --<!ENTITY torbutton.prefs.block_links "Bloquear clicks en vínculos y recargas de páginas desde distintos estados de Tor (opcional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/es/torbutton.properties -=================================================================== ---- src/chrome/locale/es/torbutton.properties (revision 15635) -+++ src/chrome/locale/es/torbutton.properties (working copy) -@@ -9,15 +9,15 @@ - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provee un botón para activar y desactivar el proxy Tor de manera fácil. - torbutton.popup.history.warning = Torbutton bloqueó un intento de manipulación del Historial.\n\nVea las preferencias del Historial para permitirlo.\n\n - torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa de un plugin.\n\nUse Guardar como.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/zh-TW/torbutton.dtd -=================================================================== ---- src/chrome/locale/zh-TW/torbutton.dtd (revision 15635) -+++ src/chrome/locale/zh-TW/torbutton.dtd (working copy) -@@ -27,61 +27,60 @@ - <!ENTITY torbutton.context_menu.about.key "A"> - <!ENTITY torbutton.button.label "Torbutton"> - <!ENTITY torbutton.button.tooltip "點擊以初始 Torbutton"> --<!ENTITY torbutton.prefs.sec_settings "Security Settings"> --<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> --<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> --<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> --<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> --<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> --<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> --<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> --<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> --<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> --<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> --<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> --<!ENTITY torbutton.prefs.cookies "Cookies"> --<!ENTITY torbutton.prefs.cache "Cache"> --<!ENTITY torbutton.prefs.history "History"> --<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> --<!ENTITY torbutton.prefs.shutdown "Shutdown"> --<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> --<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> --<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> --<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> --<!ENTITY torbutton.prefs.headers "Headers"> --<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> --<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)"> --<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> --<!ENTITY torbutton.prefs.forms "Forms"> --<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> --<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> --<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs"> --<!ENTITY torbutton.prefs.tor "Tor"> --<!ENTITY torbutton.prefs.non_tor "Non-Tor"> --<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:"> --<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> --<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> --<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> --<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> --<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> --<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> --<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> --<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.sec_settings ""> -+<!ENTITY torbutton.prefs.block_thread ""> -+<!ENTITY torbutton.prefs.block_thwrite ""> -+<!ENTITY torbutton.prefs.block_nthread ""> -+<!ENTITY torbutton.prefs.block_nthwrite ""> -+<!ENTITY torbutton.prefs.clear_history ""> -+<!ENTITY torbutton.prefs.clear_cache ""> -+<!ENTITY torbutton.prefs.block_cache ""> -+<!ENTITY torbutton.prefs.cookie_jars ""> -+<!ENTITY torbutton.prefs.mmm_cookies ""> -+<!ENTITY torbutton.prefs.clear_cookies ""> -+<!ENTITY torbutton.prefs.disable_plugins ""> -+<!ENTITY torbutton.prefs.kill_bad_js ""> -+<!ENTITY torbutton.prefs.isolate_content ""> -+<!ENTITY torbutton.prefs.no_updates ""> -+<!ENTITY torbutton.prefs.set_uagent ""> -+<!ENTITY torbutton.prefs.dynamic ""> -+<!ENTITY torbutton.prefs.cookies ""> -+<!ENTITY torbutton.prefs.cache ""> -+<!ENTITY torbutton.prefs.history ""> -+<!ENTITY torbutton.prefs.no_search ""> -+<!ENTITY torbutton.prefs.shutdown ""> -+<!ENTITY torbutton.prefs.tor_shutdown ""> -+<!ENTITY torbutton.prefs.all_shutdown ""> -+<!ENTITY torbutton.prefs.no_shutdown ""> -+<!ENTITY torbutton.prefs.disable_sessionstore ""> -+<!ENTITY torbutton.prefs.headers ""> -+<!ENTITY torbutton.prefs.spoof_english ""> -+<!ENTITY torbutton.prefs.disable_referer ""> -+<!ENTITY torbutton.prefs.disable_domstorage ""> -+<!ENTITY torbutton.prefs.forms ""> -+<!ENTITY torbutton.prefs.block_tforms ""> -+<!ENTITY torbutton.prefs.block_ntforms ""> -+<!ENTITY torbutton.prefs.notor_sessionstore ""> -+<!ENTITY torbutton.prefs.tor ""> -+<!ENTITY torbutton.prefs.non_tor ""> -+<!ENTITY torbutton.prefs.restore_tor ""> -+<!ENTITY torbutton.prefs.reload_crashed_jar ""> -+<!ENTITY torbutton.prefs.dual_cookie_jars ""> -+<!ENTITY torbutton.prefs.clear_http_auth ""> -+<!ENTITY torbutton.prefs.block_js_history ""> -+<!ENTITY torbutton.prefs.resize_on_toggle ""> -+<!ENTITY torbutton.prefs.close_tor ""> -+<!ENTITY torbutton.prefs.close_nontor ""> -+<!ENTITY torbutton.prefs.jar_certs ""> -+<!ENTITY torbutton.prefs.jar_ca_certs ""> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/zh-TW/torbutton.properties -=================================================================== ---- src/chrome/locale/zh-TW/torbutton.properties (revision 15635) -+++ src/chrome/locale/zh-TW/torbutton.properties (working copy) -@@ -7,17 +7,17 @@ - torbutton.panel.label.disabled = Tor 已停用 - torbutton.panel.label.enabled = Tor 已啟用 - extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton 提供一個切換啟用/停用 Proxy 的按鈕 --torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n --torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n --torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) --torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.history.warning = -+torbutton.popup.plugin.warning = -+torbutton.popup.confirm_ca_certs = -+torbutton.popup.ff3.warning = -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/fr-FR/torbutton.dtd -=================================================================== ---- src/chrome/locale/fr-FR/torbutton.dtd (revision 15635) -+++ src/chrome/locale/fr-FR/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner la fenêtre aux multiples de 50px à l'activation/désactivation (recommended)"> - <!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenêtres et onglets à l'activation/désactivation (optionnel)"> - <!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenêtres et onglets Non-Tor à l'activation/désactivation (optionnel)"> --<!ENTITY torbutton.prefs.block_links "Bloquer les liens cliquables et le rechargement des pages depuis différents états Tor (optionnel)"> - <!ENTITY torbutton.prefs.jar_certs "Sauver les certificats SSL dans des jars séparés Tor/Non-Tor (recommandé)"> - <!ENTITY torbutton.prefs.jar_ca_certs "Sauver les certificats CA dans des jars séparés Tor/Non-Tor (recommandé)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/fr-FR/torbutton.properties -=================================================================== ---- src/chrome/locale/fr-FR/torbutton.properties (revision 15635) -+++ src/chrome/locale/fr-FR/torbutton.properties (working copy) -@@ -11,13 +11,13 @@ - torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor de contenu de plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n - torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'Autorités personnalisé. Examiner la liste des Certificats d'Autorité est une opération lente qui ralentit la bascule vers Torn. Voulez vous desactiver l'isolations des Certificats d'Autorité ? (Si vous ne comprenez pas, il est bon de répondre Oui) - torbutton.popup.ff3.warning = Attention!\n\nTorbutton, sur Firefox 3, est connu is known laisser fuir votre fuseau horaire et les fluxs livemark durant l'utilisation de Tor. En outre, il n'a pas encore été intensivement testé ,comme Firefox 2, pour la sécurité de Tor et l'ergonomie.\n\nVoulez-vous néanmoins continuer? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = -Index: src/chrome/locale/de-DE/torbutton.dtd -=================================================================== ---- src/chrome/locale/de-DE/torbutton.dtd (revision 15635) -+++ src/chrome/locale/de-DE/torbutton.dtd (working copy) -@@ -71,17 +71,16 @@ - <!ENTITY torbutton.prefs.resize_on_toggle "Verändere die Größe des Fensters zu einem Vielfachen von 50px während der Nutzung von Tor (empfohlen)"> - <!ENTITY torbutton.prefs.close_tor "Schließe alle Tor-Fenster und -Tabs beim Wechsel (optional)"> - <!ENTITY torbutton.prefs.close_nontor "Schließe alle Nicht-Tor-Fenster und -Tabs beim Wechsel (optional)"> --<!ENTITY torbutton.prefs.block_links "Sperre Klicks auf Links und Neuladen von Seiten von verschiedenen Tor-Stati (optional)"> - <!ENTITY torbutton.prefs.jar_certs "Speichere SSL-Zertifikate in verschiedenen Dateien für Tor/Nicht-Tor (empfohlen)"> - <!ENTITY torbutton.prefs.jar_ca_certs "Speichere CA-Zertifikate in verschiedenen Dateien für Tor/Nicht-Tor (empfohlen)"> --<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> --<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> --<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> --<!ENTITY torbutton.prefs.startup "Startup"> --<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs"> --<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> --<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> --<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> --<!ENTITY torbutton.prefs.test_settings "Test Settings"> --<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> --<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -+<!ENTITY torbutton.prefs.locked_mode ""> -+<!ENTITY torbutton.prefs.startup_state ""> -+<!ENTITY torbutton.prefs.shutdown_state ""> -+<!ENTITY torbutton.prefs.startup ""> -+<!ENTITY torbutton.prefs.nonontor_sessionstore ""> -+<!ENTITY torbutton.prefs.block_tor_file_net ""> -+<!ENTITY torbutton.prefs.block_nontor_file_net ""> -+<!ENTITY torbutton.prefs.restore_defaults ""> -+<!ENTITY torbutton.prefs.test_settings ""> -+<!ENTITY torbutton.prefs.test_auto ""> -+<!ENTITY torbutton.prefs.disable_livemarks ""> -Index: src/chrome/locale/de-DE/torbutton.properties -=================================================================== ---- src/chrome/locale/de-DE/torbutton.properties (revision 15635) -+++ src/chrome/locale/de-DE/torbutton.properties (working copy) -@@ -11,13 +11,13 @@ - torbutton.popup.plugin.warning = Der Inhalt des Plugins konnte nicht direkt heruntergeladen werden, weil Torbutton dies verhinderte.\n\nBitte stattdessen "Speichern als" verwenden.\n - torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene Zertifikatsautoritäten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen Zertifikationsautoritäten-Liste ist aufwändig und verlangsamt das schnelle An- und Abschalten von Tor. Möchten Sie die Isolation von Zertifikatsautoritäten abschalten? (Wenn Sie nicht wissen, was gemeint ist, können Sie ruhig auf OK klicken) - torbutton.popup.ff3.warning = Warnung!\n\nTorbutton unter Firefox 3 kann nicht verhindern, dass ihre Zeitzone und Livemark Feeds während der Benutzung von Tor an Dritte gelangen. Ausserdem wurde die Sicherheit und Benutzerfreundlichkeit von Tor nicht im selben Umfang wie für Firefox 2 getestet.\n\nMöchten Sie trotzdem weiter fortfahren? --torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. --torbutton.popup.test.success = Tor proxy test successful! --torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy settings. --torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. --torbutton.panel.label.verified = Tor Verified --torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? --torbutton.prefs.recommended = (recommended) --torbutton.prefs.optional = (optional) --torbutton.prefs.crucial = (crucial) -+torbutton.popup.toggle.warning = -+torbutton.popup.test.success = -+torbutton.popup.test.failure = -+torbutton.popup.test.confirm_toggle = -+torbutton.popup.test.ff3_notice = -+torbutton.panel.label.verified = -+torbutton.popup.test.auto_failed = -+torbutton.prefs.recommended = -+torbutton.prefs.optional = -+torbutton.prefs.crucial = diff --git a/trans_tools/validate.py b/trans_tools/validate.py deleted file mode 100755 index 179e7b0..0000000 --- a/trans_tools/validate.py +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/python - -from __future__ import unicode_literals, print_function - -import polib -import sys -import getopt - -symbols = [ - '(', ')', '<', '>', '{', - '}', '[', ']', '\"', ';' - ] - -counts = {} - -def reset(): - for s in symbols: - counts[s] = 0 - -def parse_orig_string(string): - for ch in string: - if ch in symbols: - counts[ch] += 1 - -def parse_trans_string(string): - for ch in string: - if ch in symbols: - counts[ch] -= 1 - -def get_strings(file): - entries = [] - po = polib.pofile(file, autodetect_encoding=True) - - for entry in po: - entries.append((entry.msgid, entry.msgstr, 0)) - - return entries - -def warn(): - for s in symbols: - if counts[s] < 0: - return True - return False - -def usage(): - print("Usage: %s -i/--input=<file.po> -l/--logfile=<logfile>" % sys.argv[0]) - -def log(string, file_to_check, log_file, linenum = -1): - f = log_file - if linenum == -1: - f.write(("%s: %s\n" % (file_to_check, string)).encode("utf-8")) - else: - f.write(("%s (%s): %s\n" % (file_to_check, linenum, string)).encode("utf-8")) - #f.close() - -def check(file_to_check, log_file): - errors = 0 - - strings = get_strings(file_to_check) - for (orig, trans, linenum) in strings: - reset() - parse_orig_string(orig) - parse_trans_string(trans) - if warn(): - errors += 1 - log(trans, file_to_check, log_file, linenum) - - if errors != 0: - log("Total count of warnings %d\n" % errors, file_to_check, log_file) - -if __name__ == '__main__': - try: - opts, args = getopt.getopt(sys.argv[1:], "i:hl:", ["input=", "help", "logfile="]) - except getopt.GetoptError, err: - print(str(err)) - sys.exit(2) - - file_to_check = None - log_file = sys.stdout - - for opt, arg in opts: - if opt in ("-i", "--input"): - file_to_check = arg - elif opt in ("-h", "--help"): - usage() - sys.exit() - elif opt in ("-l", "--logfile"): - log_file = arg - - if file_to_check is None or log_file is None: - print("ERROR: You need to specify both the input and the logfile") - sys.exit(2) - - check(file_to_check, log_file) diff --git a/trans_tools/validate_all.sh b/trans_tools/validate_all.sh deleted file mode 100755 index 47bb6e6..0000000 --- a/trans_tools/validate_all.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for i in `ls -1 ./po` -do - ./validate.py --input=./po/$i/torbutton.dtd.po - ./validate.py --input=./po/$i/torbutton.properties.po -done

1 0

r26353: {website} update mirror and the table. (in website/trunk: . include)
by Andrew Lewman 18 Sep '13

18 Sep '13

Author: phobos Date: 2013-09-18 15:14:52 +0000 (Wed, 18 Sep 2013) New Revision: 26353 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirror and the table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-09-16 02:04:03 UTC (rev 26352) +++ website/trunk/include/mirrors-table.wmi 2013-09-18 15:14:52 UTC (rev 26353) @@ -1,49 +1,49 @@ <tr> - <td>US</td> + <td>FR</td> - <td>AskApache</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>FR</td> + <td>SE</td> - <td>BarkerJr</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> - <td></td> + <td>tor-mirror.de</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor-mirror.de/dist/">http</a></td> + <td><a href="http://tor-mirror.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -54,30 +54,47 @@ <td>DE</td> + <td>spline</td> + + <td>Up to date</td> + + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> + <td><a href="rsync://ftp.spline.de/tor/dist">rsync</a></td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dev-random.de/dist/">http</a></td> - <td><a href="http://tor.dev-random.de/">http</a></td> - <td><a href="https://tor.dev-random.de/dist/">https</a></td> - <td><a href="https://tor.dev-random.de/">https</a></td> + <td><a href="http://torproject.guilhem.org/dist/">http</a></td> + <td><a href="http://torproject.guilhem.org/">http</a></td> + <td><a href="https://torproject.guilhem.org/dist/">https</a></td> + <td><a href="https://torproject.guilhem.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>borgmann.tv</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -86,19 +103,19 @@ <tr> - <td>DE</td> + <td>RO</td> - <td>torservers</td> + <td>me0w.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -122,30 +139,30 @@ <td>US</td> - <td></td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-dist">rsync</a></td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>AU</td> + <td>HU</td> - <td>CoffsWiFi</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.coffswifi.net/dist">http</a></td> - <td><a href="http://torproject.coffswifi.net">http</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -171,49 +188,49 @@ <tr> - <td>LT</td> + <td>FR</td> - <td></td> + <td>linsrv</td> <td>Up to date</td> + <td><a href="ftp://ftp.linsrv.net/pub/torproject/">ftp</a></td> + <td><a href="http://mirrors.linsrv.net/torproject/dist/">http</a></td> + <td><a href="http://mirrors.linsrv.net/torproject/">http</a></td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="mirrors.linsrv.net::pub/torproject/dist">rsync</a></td> + <td><a href="mirrors.linsrv.net::pub/torproject">rsync</a></td> </tr> <tr> - <td>AT</td> + <td>US</td> - <td>cyberarmy</td> + <td>hessmo</td> <td>Up to date</td> <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>NO</td> + <td>DK</td> - <td>MultiNet AS</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.multinet.no/dist/">http</a></td> - <td><a href="http://tor.multinet.no/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -222,15 +239,15 @@ <tr> - <td>DE</td> + <td>US</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taskserver.de/dist/">http</a></td> - <td><a href="http://tor.taskserver.de/">http</a></td> + <td><a href="http://199.175.55.215/dist/">http</a></td> + <td><a href="http://199.175.55.215/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -239,32 +256,32 @@ <tr> - <td>HU</td> + <td>GB</td> - <td>Unknown</td> + <td>torland</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>chaos darmstadt</td> + <td>BBLN.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,15 +290,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -290,32 +307,32 @@ <tr> - <td>UK</td> + <td>CH</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mage.me.uk/dist/">http</a></td> - <td><a href="http://tor.mage.me.uk/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/">http</a></td> + <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> + <td><a href="https://torproject.pillo-srv.ch/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>hessmo</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -324,32 +341,32 @@ <tr> - <td>GB</td> + <td>DE</td> - <td>torland</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>US</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +375,15 @@ <tr> - <td>CZ</td> + <td>AU</td> - <td>Lightning-bolt.net</td> + <td>CoffsWiFi</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> + <td><a href="http://torproject.coffswifi.net/dist">http</a></td> + <td><a href="http://torproject.coffswifi.net">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,32 +392,32 @@ <tr> - <td>DE</td> + <td>NO</td> - <td>[[:bbs:]]</td> + <td>MultiNet AS</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.multinet.no/dist/">http</a></td> + <td><a href="http://tor.multinet.no/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> - <td>CCC</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -409,49 +426,32 @@ <tr> - <td>FR</td> + <td>NL</td> - <td>linsrv</td> + <td>CCC</td> <td>Up to date</td> - <td><a href="ftp://ftp.linsrv.net/pub/torproject/">ftp</a></td> - <td><a href="http://mirrors.linsrv.net/torproject/dist/">http</a></td> - <td><a href="http://mirrors.linsrv.net/torproject/">http</a></td> <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> - <td><a href="mirrors.linsrv.net::pub/torproject/dist">rsync</a></td> - <td><a href="mirrors.linsrv.net::pub/torproject">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://199.175.55.215/dist/">http</a></td> - <td><a href="http://199.175.55.215/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> + <td>CZ</td> - <td></td> + <td>Lightning-bolt.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -462,51 +462,34 @@ <td>DE</td> - <td>spline</td> + <td>beme it</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> - <td><a href="rsync://ftp.spline.de/tor/dist">rsync</a></td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="rsync://tor.beme-it.de/tor/dist">rsync</a></td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>IS</td> + <td>AT</td> - <td>torproject.is</td> + <td>TechAsk.IT</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -530,47 +513,47 @@ <td>AT</td> - <td>TechAsk.IT</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IS</td> + <td>US</td> - <td>myRL.net</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -579,49 +562,49 @@ <tr> - <td>CH</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> - <td><a href="http://torproject.pillo-srv.ch/">http</a></td> - <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> - <td><a href="https://torproject.pillo-srv.ch/">https</a></td> + <td><a href="http://tor.dev-random.de/dist/">http</a></td> + <td><a href="http://tor.dev-random.de/">http</a></td> + <td><a href="https://tor.dev-random.de/dist/">https</a></td> + <td><a href="https://tor.dev-random.de/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>US</td> + <td>UK</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.guilhem.org/dist/">http</a></td> - <td><a href="http://torproject.guilhem.org/">http</a></td> - <td><a href="https://torproject.guilhem.org/dist/">https</a></td> - <td><a href="https://torproject.guilhem.org/">https</a></td> + <td><a href="http://tor.mage.me.uk/dist/">http</a></td> + <td><a href="http://tor.mage.me.uk/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://144.76.105.110/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://144.76.105.110/mirrors/torproject.org/">http</a></td> + <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -630,15 +613,15 @@ <tr> - <td>FR</td> + <td>IS</td> - <td></td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,19 +630,19 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>TheOnionRouter</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -681,32 +664,32 @@ <tr> - <td>US</td> + <td>EE</td> - <td>NW Linux</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-dist">rsync</a></td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,66 +698,66 @@ <tr> - <td>NL</td> + <td>AT</td> - <td>Amorphis</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td></td> + <td>HackThisSite.org</td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> - <td><a href="http://torproject.cryptowars.info/">http</a></td> - <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> - <td><a href="https://torproject.cryptowars.info/">https</a></td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></td> + <td><a href="https://mirror.hackthissite.org/tor">https</a></td> + <td><a href="https://tor.hackthissite.org/">https</a></td> <td> - </td> - <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>beme it</td> + <td>searchprivate</td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> - <td><a href="rsync://tor.beme-it.de/tor/dist">rsync</a></td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>RO</td> + <td>IN</td> - <td>me0w.cc</td> + <td>India Tor Fans</td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -783,15 +766,15 @@ <tr> - <td>NL</td> + <td>DE</td> - <td>BBLN.nl</td> + <td>borgmann.tv</td> - <td>Up to date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> - <td><a href="http://mirror.bbln.nl/tor/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -800,19 +783,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td>HackThisSite.org</td> + <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.hackthissite.org/tor">http</a></td> - <td><a href="http://tor.hackthissite.org/">http</a></td> - <td><a href="https://mirror.hackthissite.org/tor">https</a></td> - <td><a href="https://tor.hackthissite.org/">https</a></td> + <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> + <td><a href="http://torproject.cryptowars.info/">http</a></td> + <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> + <td><a href="https://torproject.cryptowars.info/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> </tr> <tr> @@ -821,7 +804,7 @@ <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> <td> - </td> @@ -834,15 +817,15 @@ <tr> - <td>US</td> + <td>LT</td> - <td>searchprivate</td> + <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -851,32 +834,32 @@ <tr> - <td>IN</td> + <td>NL</td> - <td>India Tor Fans</td> + <td></td> <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> - <td>IS</td> + <td>LU</td> - <td>Frenn vun der Enn A.S.B.L.</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.lu/dist/">http</a></td> - <td><a href="http://torproject.lu/">http</a></td> + <td><a href="http://torproject.adamas.ai/dist/">http</a></td> + <td><a href="http://torproject.adamas.ai/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -891,26 +874,26 @@ <td>Unknown</td> + <td><a href="ftp://mirrors.go-parts.com/tor/">ftp</a></td> + <td><a href="http://mirrors.go-parts.com/tor/dist/">http</a></td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> + <td><a href="rsync://mirrors.go-parts.com/mirrors/tor/">rsync</a></td> <td> - </td> - <td> - </td> </tr> <tr> - <td>FR</td> + <td>US</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://37.187.0.127/tormirror/dist/">http</a></td> - <td><a href="http://37.187.0.127/tormirror/">http</a></td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -919,15 +902,15 @@ <tr> - <td>LU</td> + <td>UA</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.adamas.ai/dist/">http</a></td> - <td><a href="http://torproject.adamas.ai/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -942,27 +925,27 @@ <td>Unknown</td> - <td><a href="ftp://mirrors.go-parts.com/tor/">ftp</a></td> - <td><a href="http://mirrors.go-parts.com/tor/dist/">http</a></td> <td> - </td> + <td><a href="http://tor.minibofh.org/dist/">http</a></td> + <td><a href="http://tor.minibofh.org/">http</a></td> <td> - </td> <td> - </td> - <td><a href="rsync://mirrors.go-parts.com/mirrors/tor/">rsync</a></td> <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> <td></td> <td>DO NOT USE. Out of date.</td> <td> - </td> + <td><a href="http://www.netgull.com/torproject/">http</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -970,49 +953,66 @@ <tr> - <td>UA</td> + <td>EE</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> + <td><a href="http://tor.li/dist/">http</a></td> + <td><a href="http://tor.li/">http</a></td> + <td><a href="https://tor.li/dist/">https</a></td> + <td><a href="https://tor.li/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td>Frenn vun der Enn A.S.B.L.</td> + + <td>Unknown</td> + <td> - </td> + <td><a href="http://torproject.lu/dist/">http</a></td> + <td><a href="http://torproject.lu/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>EE</td> + <td>MX</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.c3l.lu/dist/">http</a></td> - <td><a href="http://torproject.c3l.lu/">http</a></td> + <td><a href="http://tor.taskserver.de/dist/">http</a></td> + <td><a href="http://tor.taskserver.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -1021,19 +1021,19 @@ <tr> - <td>US</td> + <td>FR</td> <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://www.netgull.com/torproject/">http</a></td> + <td><a href="http://torproject.c3l.lu/dist/">http</a></td> + <td><a href="http://torproject.c3l.lu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> @@ -1055,17 +1055,17 @@ <tr> - <td>MX</td> + <td>IS</td> - <td></td> + <td>myRL.net</td> <td>Unknown</td> <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -1074,13 +1074,13 @@ <td>FR</td> - <td>LazyTiger</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://37.187.0.127/tormirror/dist/">http</a></td> + <td><a href="http://37.187.0.127/tormirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -1089,15 +1089,15 @@ <tr> - <td>US</td> + <td>FR</td> - <td></td> + <td>LazyTiger</td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.minibofh.org/dist/">http</a></td> - <td><a href="http://tor.minibofh.org/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-09-16 02:04:03 UTC (rev 26352) +++ website/trunk/update-mirrors.pl 2013-09-18 15:14:52 UTC (rev 26353) @@ -1236,22 +1236,22 @@ hiddenServiceMirror => "" }, mirror100 => { - adminContact => "nsane2307 /AT\ eml /DOT\ cc", - orgName => "", - isoCC => "DE", - subRegion => "Germany", - region => "Europe", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://144.76.105.110/mirrors/torproject.org/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://144.76.105.110/mirrors/torproject.org/dist/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "" + adminContact => "nsane2307 eml cc", + orgName => "tor-mirror.de", + isoCC => "DE", + subRegion => "Germany", + region => "Europe", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor-mirror.de/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor-mirror.de/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "" }, mirror101 => { adminContact => "info /AT\ enn /DOT\ lu",

1 0

[metrics-web/master] Cut off last two days from new user estimate graphs.
by karsten＠torproject.org 18 Sep '13

18 Sep '13

commit 5a26a2cfef46111b66eb8492abb8743313509c22 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 18 14:10:23 2013 +0200 Cut off last two days from new user estimate graphs. We found out in #8462 that "we can make our very first guess about Tor users on a given day by the evening of that day and will have credible numbers by the end of the next day." Implementing that by cutting off the last two days from graphs. Spotted by Roger. --- rserve/graphs.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index da39327..9070308 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -1024,7 +1024,7 @@ plot_bandwidth_flags <- function(start, end, path) { plot_userstats <- function(start, end, node, variable, value, events, path) { - end <- min(end, as.character(Sys.Date())) + end <- min(end, as.character(Sys.Date() - 2)) u <- read.csv(paste("/srv/metrics.torproject.org/task-8462-graphs/", "task-8462/userstats.csv", sep = ""), stringsAsFactors = FALSE)

1 0

[tor-browser/tor-browser-17.0.9esr-1] Disable timestamps in TLS handshake.
by mikeperry＠torproject.org 17 Sep '13

17 Sep '13

commit a7bd3d31373e1dd14eb67166ef4e1829efc904de Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 17 14:55:09 2013 -0700 Disable timestamps in TLS handshake. Only useful for linkability anyway. --- security/nss/lib/ssl/ssl3con.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index bc63013..6633006 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -781,16 +781,10 @@ ssl3_NegotiateVersion(sslSocket *ss, SSL3ProtocolVersion peerVersion, static SECStatus ssl3_GetNewRandom(SSL3Random *random) { - PRUint32 gmt = ssl_Time(); SECStatus rv; - random->rand[0] = (unsigned char)(gmt >> 24); - random->rand[1] = (unsigned char)(gmt >> 16); - random->rand[2] = (unsigned char)(gmt >> 8); - random->rand[3] = (unsigned char)(gmt); - - /* first 4 bytes are reserverd for time */ - rv = PK11_GenerateRandom(&random->rand[4], SSL3_RANDOM_LENGTH - 4); + /* Timestamps? We don't need no stinking timestamps. */ + rv = PK11_GenerateRandom(random->rand, SSL3_RANDOM_LENGTH); if (rv != SECSuccess) { ssl_MapLowLevelError(SSL_ERROR_GENERATE_RANDOM_FAILURE); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2013