May 2013 - tor-commits - lists.torproject.org

[torbrowser/maint-2.4] bump recommended-versions
by erinn＠torproject.org 14 May '13

14 May '13

commit d4653adf5858f4073d0eaee0b3f5e1f06a235439 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 14 09:37:34 2013 -0300 bump recommended-versions --- build-scripts/recommended-versions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8c3a5b5..bb4d1e3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,8 +1,8 @@ [ -"2.3.25-6-MacOS", -"2.3.25-6-Windows", -"2.3.25-6-Linux", -"2.4.12-alpha-1-MacOS", -"2.4.12-alpha-1-Windows", -"2.4.12-alpha-1-Linux" +"2.3.25-8-MacOS", +"2.3.25-8-Windows", +"2.3.25-8-Linux", +"2.4.12-alpha-2-MacOS", +"2.4.12-alpha-2-Windows", +"2.4.12-alpha-2-Linux" ]

1 0

[torbrowser/master] bump recommended-versions
by erinn＠torproject.org 14 May '13

14 May '13

commit d4653adf5858f4073d0eaee0b3f5e1f06a235439 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 14 09:37:34 2013 -0300 bump recommended-versions --- build-scripts/recommended-versions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8c3a5b5..bb4d1e3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,8 +1,8 @@ [ -"2.3.25-6-MacOS", -"2.3.25-6-Windows", -"2.3.25-6-Linux", -"2.4.12-alpha-1-MacOS", -"2.4.12-alpha-1-Windows", -"2.4.12-alpha-1-Linux" +"2.3.25-8-MacOS", +"2.3.25-8-Windows", +"2.3.25-8-Linux", +"2.4.12-alpha-2-MacOS", +"2.4.12-alpha-2-Windows", +"2.4.12-alpha-2-Linux" ]

1 0

r26183: {website} bump alpha and stable TBBs to 2.4.12-alpha-2 and 2.3.25-8 fo (website/trunk/include)
by Erinn Clark 14 May '13

14 May '13

Author: erinn Date: 2013-05-14 12:11:30 +0000 (Tue, 14 May 2013) New Revision: 26183 Modified: website/trunk/include/versions.wmi Log: bump alpha and stable TBBs to 2.4.12-alpha-2 and 2.3.25-8 for Firefox 17.0.6esr Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-05-12 19:00:34 UTC (rev 26182) +++ website/trunk/include/versions.wmi 2013-05-14 12:11:30 UTC (rev 26183) @@ -23,38 +23,38 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.12-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-6</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-8</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.0k</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>17.0.5esr</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.5.1</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.12-alpha-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.12-alpha-2</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.11-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-6</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-6</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-8</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-8</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.5esr</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.1</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.12-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.12-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.12-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.12-alpha-2</define-tag> <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.11-alpha-2-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.11-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-6</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-6</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-8</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-8</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.5esr</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.12-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.12-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.12-alpha-2</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.12-alpha-2</define-tag> <define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.11-alpha-2-pt1</define-tag> <define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.11-alpha-2-pt1</define-tag>

1 0

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

14 May '13

commit d8a78626c953bd0f4d02898c17bc423daa7ff486 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 11:46:12 2013 +0000 Update translations for tails-greeter_completed --- es/es.po | 51 +++++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/es/es.po b/es/es.po index 07ce4cc..0510b6f 100644 --- a/es/es.po +++ b/es/es.po @@ -4,14 +4,15 @@ # # Translators: # Envite <envite(a)rolamasao.org>, 2013 +# strel <strelnic(a)gmail.com>, 2013 # strel <strelnic(a)gmail.com>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-05-09 22:08+0000\n" -"Last-Translator: Envite <envite(a)rolamasao.org>\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-05-14 11:35+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,41 +20,43 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 -#: ../GdmGreeter/persistencewindow.py:128 +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Adelante" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" msgstr "Ingresar" -#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" msgstr "Bienvenido a Tails" -#: ../glade/persistencewindow.glade.h:3 +#: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" msgstr "¿Usar persistencia?" -#: ../glade/persistencewindow.glade.h:4 +#: ../glade/persistencewindow.glade.h:5 msgid "Yes" msgstr "Sí" -#: ../glade/persistencewindow.glade.h:5 +#: ../glade/persistencewindow.glade.h:6 msgid "No" msgstr "No" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" msgstr "Frase de contraseña:" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" msgstr "¿Sólo lectura?" -#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 -#: ../glade/langpanel.glade.h:1 -msgid " " -msgstr " " - #: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "Frase de contraseña incorrecta. Por favor, inténtelo de nuevo." + +#: ../glade/persistencewindow.glade.h:10 msgid "More options?" msgstr "¿Más opciones?" @@ -75,6 +78,10 @@ msgstr "Contraseña:" msgid "Verify Password:" msgstr "Verifique la contraseña: " +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "Las contraseñas no concuerdan" + #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" msgstr "Camuflaje de Windows" @@ -89,6 +96,10 @@ msgstr "Esta opción hace que Tails se parezca más a Microsoft Windows XP. Esto msgid "Activate Microsoft Windows XP Camouflage" msgstr "Activar camuflaje de Microsoft Windows XP" +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" msgstr "Idioma" @@ -101,10 +112,6 @@ msgstr "Localización" msgid "Layout" msgstr "Composición" -#: ../GdmGreeter/optionswindow.py:68 -msgid "Passwords do not match" -msgstr "Las contraseñas no concuerdan" - #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" @@ -128,10 +135,6 @@ msgid "" "%(stderr)s" msgstr "live-persist falló devolviendo el código %(returncode)s: \n%(stdout)s \n%(stderr)s" -#: ../GdmGreeter/persistencewindow.py:94 -msgid "Wrong passphrase. Please try again." -msgstr "Frase de contraseña incorrecta. Por favor, inténtelo de nuevo." - #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..."

1 0

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

14 May '13

commit ee1d79d7eb23ddadebf426c5c13d6c5171375a90 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 11:46:10 2013 +0000 Update translations for tails-greeter --- es/es.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index ea12862..0510b6f 100644 --- a/es/es.po +++ b/es/es.po @@ -4,14 +4,15 @@ # # Translators: # Envite <envite(a)rolamasao.org>, 2013 +# strel <strelnic(a)gmail.com>, 2013 # strel <strelnic(a)gmail.com>, 2012-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-05-13 08:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-14 11:35+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "Adelante" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login"

1 0

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

14 May '13

commit ce179c54c337e4a9f890a7d2694928f3578f5f4b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 11:46:06 2013 +0000 Update translations for tails-persistence-setup --- nb/nb.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 04c8740..334dc7c 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-05-14 11:16+0000\n" +"PO-Revision-Date: 2013-05-14 11:19+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -76,11 +76,11 @@ msgstr "Konfigurering av nettverksenheter og tilkoblinger" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Nettleser bokmerker" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Bokmerker lagret i Iceweasel nettleseren" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -241,12 +241,12 @@ msgstr "Feilet" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 msgid "Correcting attributes on Tails system partition." -msgstr "" +msgstr "Korrigerer attributter på Tails systempartisjon." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 #: ../lib/Tails/Persistence/Step/Delete.pm:87 msgid "The attributes of the Tails system partition will be corrected." -msgstr "" +msgstr "Attributtene på Tails systempartisjon vil bli korrigert." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 msgid "Mounting Tails persistence partition." @@ -290,7 +290,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:" -msgstr "" +msgstr "Destinasjon:" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..."

1 0

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

14 May '13

commit 34f6667ac6777c3339b543f3d33b5b5497ed0651 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 11:16:13 2013 +0000 Update translations for tails-persistence-setup --- nb/nb.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 544ce4a..04c8740 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-05-13 19:07+0000\n" +"PO-Revision-Date: 2013-05-14 11:16+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -161,21 +161,21 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format msgid "Tails is running from non-USB device %s." -msgstr "" +msgstr "Tails kjører fra ikke-USB enheten %s." #: ../lib/Tails/Persistence/Setup.pm:513 #, perl-format msgid "Device %s is optical." -msgstr "" +msgstr "Enheten %s er optisk." #: ../lib/Tails/Persistence/Setup.pm:520 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "" +msgstr "Enheten %s ble ikke laget ved å bruke Tails USB installerer." #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" -msgstr "" +msgstr "Feil" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" @@ -186,7 +186,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Endringer du har gjort vil kun taes bruk etter omstart av Tails.\n\nDu kan nå lukke dette programmet." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" @@ -278,7 +278,7 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "De valgte filene vil bli lagret i den krypterte partisjonen %s (%s), på %s %s enheten." #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 May '13

14 May '13

commit 1da76ee049b2ea88fc84784c9c972706f4d850be Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 11:15:37 2013 +0000 Update translations for vidalia_help --- sv/netview.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/netview.po b/sv/netview.po index 0cec70a..f1844de 100644 --- a/sv/netview.po +++ b/sv/netview.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-13 21:23+0000\n" +"PO-Revision-Date: 2013-05-14 10:51+0000\n" "Last-Translator: tryy3 <dennistryy3(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -114,7 +114,7 @@ msgid "" "On the left side of the network view, you will see a list of relays in the " "Tor network. Next to each relay is an icon indicating that relay's status. " "The following table summarizes the possible relay status icons:" -msgstr "" +msgstr "På vänstra sidan av nätverkskartan, kommer du se en lista av reläer i Tor-nätverk. Brevid varje relä är en ikon som visar reläets status. Nästa tabell sammanfattar möjliga reläers status ikon;" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:78

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 14 May '13

14 May '13

commit cd2aac8c8f5e2e074e28e31305df4d2ee3251ab5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 08:46:42 2013 +0000 Update translations for tor-launcher-network-settings_completed --- en/network-settings.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/network-settings.dtd b/en/network-settings.dtd index f8893ea..9e812de 100644 --- a/en/network-settings.dtd +++ b/en/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, proxied, or filtered."> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 May '13

14 May '13

commit 4815c9a7c121af530fc1ab01a6abac2aff641378 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 08:46:36 2013 +0000 Update translations for tor-launcher-network-settings --- en/network-settings.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/network-settings.dtd b/en/network-settings.dtd index f8893ea..9e812de 100644 --- a/en/network-settings.dtd +++ b/en/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, proxied, or filtered."> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles.">

1 0