March 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix bug that leads to not showing the help if an option is not present.
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 4938ad08bf041d82d3465d03a6c47f198c04085a Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 20 18:39:07 2014 +0000 Fix bug that leads to not showing the help if an option is not present. --- ooni/deck.py | 15 +++++++++------ ooni/nettest.py | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 260f8b4..79f8f48 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -122,16 +122,19 @@ class Deck(InputFile): def insert(self, net_test_loader): """ Add a NetTestLoader to this test deck """ + def has_test_helper(missing_option): + for rth in net_test_loader.requiredTestHelpers: + if missing_option == rth['option']: + return True + return False try: net_test_loader.checkOptions() - except e.MissingRequiredOption, option_name: + except e.MissingRequiredOption, missing_options: if not self.bouncer: raise - for rth in net_test_loader.requiredTestHelpers: - if option_name.message == rth['option']: - break - else: - raise + for missing_option in missing_options.message: + if not has_test_helper(missing_option): + raise self.netTestLoaders.append(net_test_loader) @defer.inlineCallbacks diff --git a/ooni/nettest.py b/ooni/nettest.py index 1780953..ec80bf7 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -758,11 +758,14 @@ class NetTestCase(object): raise e.InvalidOption def _checkRequiredOptions(self): + missing_options = [] for required_option in self.requiredOptions: log.debug("Checking if %s is present" % required_option) if required_option not in self.localOptions or \ self.localOptions[required_option] == None: - raise e.MissingRequiredOption(required_option) + missing_options.append(required_option) + if missing_options: + raise e.MissingRequiredOption(missing_options) def __repr__(self): return "<%s inputs=%s>" % (self.__class__, self.inputs)

1 0

[ooni-probe/master] Merge pull request #288 from TheTorProject/fix/pre_setup
by art＠torproject.org 07 Mar '14

07 Mar '14

commit bb447331df102d6bc969aa197108ce45ee84e3b6 Merge: efb85ae 4938ad0 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Fri Mar 7 13:05:33 2014 +0100 Merge pull request #288 from TheTorProject/fix/pre_setup Fix bug that leads to not showing the help if an option is not present. ooni/deck.py | 15 +++++++++------ ooni/nettest.py | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 30e47444a861d2a74002a7e9121d9f7b5e88f4db Merge: 58aab66 bb44733 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 7 13:31:33 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Fix bug that leads to not showing the help if an option is not present. ooni/deck.py | 15 +++++++++------ ooni/nettest.py | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Update changelog for 1.0.0
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 58aab6667cc77816c08acb808dce1ce7a90a4652 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 7 13:30:21 2014 +0100 Update changelog for 1.0.0 --- ChangeLog.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 93379ce..f79a219 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,15 @@ +## v1.0.0 + +* Add bouncer support for discovering test helpers and collectors + +* Fix bug that lead to HTTP tests to stall + +* Add support for connect_error and connection_lost_error error types + +* Add support for additional Tor configuration keys + +* Add disclaimer when running ooniprobe + ## v0.1.0 Improvements to HTML/JS based user interface:

1 0

[ooni-probe/master] Fix bug in initializing of the test instance.
by art＠torproject.org 07 Mar '14

07 Mar '14

commit efb85aed9a4797914587a319c7b8e86fea86c7ab Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 19:02:28 2014 +0100 Fix bug in initializing of the test instance. --- ooni/tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/tasks.py b/ooni/tasks.py index efca9b0..9c76a04 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -105,11 +105,11 @@ class Measurement(TaskWithTimeout): """ self.testInstance = test_instance self.testInstance.input = test_input + self.testInstance._setUp() if 'input' not in self.testInstance.report.keys(): self.testInstance.report = {'input': test_input} - self.testInstance._setUp() - self.testInstance._start_time = time.time() - self.testInstance.setUp() + self.testInstance._start_time = time.time() + self.testInstance.setUp() self.netTestMethod = getattr(self.testInstance, test_method)

1 0

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

07 Mar '14

commit 5658daecb7e35197689ca0d471ac7664ab9581c4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 12:15:20 2014 +0000 Update translations for tails-greeter --- nb/nb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 261a5fb..dc8b22b 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 12:15+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +92,7 @@ msgstr "Passordene samsvarer ikke" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Windows-kamuflasje" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -138,7 +138,7 @@ msgstr "Parodier alle MAC-adresser" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Nettverkskonfigurasjon" #: ../glade/optionswindow.glade.h:20 msgid ""

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 4b781d4d278c3f91d44d6e5744145923277620f5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 11:15:42 2014 +0000 Update translations for tails-misc_completed --- ja.po | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/ja.po b/ja.po index 105ce10..cdd4dab 100644 --- a/ja.po +++ b/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-11 10:00+0000\n" +"POT-Creation-Date: 2014-03-06 14:52+0100\n" +"PO-Revision-Date: 2014-03-07 11:10+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -247,21 +247,21 @@ msgstr "ビルド情報:\n%s" msgid "About Tails" msgstr "Tailsについて" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "追加ソフトウェア" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "アップグレードに失敗しました。これはおそらくネットワーク上の問題によるものです。ネットワークの設定を確認した後にTailsを再起動するか、システムログを参照してください。" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." msgstr "アップグレード成功。" @@ -279,10 +279,45 @@ msgstr "Torは、特にHidden Serviceのために、適切に動作するのに msgid "Failed to synchronize the clock!" msgstr "時計の同期に失敗！" +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 +msgid "Network connection blocked?" +msgstr "ネットワーク接続がブロックされていますか？" + +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 +msgid "" +"It looks like you are blocked from the network. This may be related to the " +"MAC spoofing feature. For more information, see the <a " +"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" +" spoofing documentation</a>." +msgstr "ネットワークからブロックされているようです。これは MAC スプーフィングに関係する場合があります。詳細については、 <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC スプーフィングのドキュメント</a>をご覧ください。" + #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Tailsのこのバージョンには、既知のセキュリティ問題が存在します:" +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "ネットワークカード ${nic} が無効になりました" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗したので、一時的に無効化されます。\nTails を再起動して、 MAC スプーフィーングを無効化したいかもしれません。<a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>ドキュメント</a>をご覧ください。" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +msgid "All networking disabled" +msgstr "全ネットワーク機能無効" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗しました。エラーリカバリも失敗したので、全ネットワーク機能が無効になります。 Tails を再起動して、 MAC スプーフィングを無効化したいと思うかもしれません。<a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>ドキュメント</a>をご覧ください。" + #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." msgstr "I2Pを起動中..." @@ -409,10 +444,15 @@ msgstr "TrueCryptは、ライセンスと開発上の懸念のために、まも msgid "Report an error" msgstr "エラーを報告" -#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" msgstr "Tailsのドキュメント" +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "Tails の使い方を知る" + #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " msgstr "匿名オーバーレイネットワーク"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit f7fe28533adca2d5d71b7592318b82c79c210fe8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 11:15:37 2014 +0000 Update translations for tails-misc --- ja.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ja.po b/ja.po index 757ba8d..cdd4dab 100644 --- a/ja.po +++ b/ja.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 11:10+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,7 +281,7 @@ msgstr "時計の同期に失敗！" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "ネットワーク接続がブロックされていますか？" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -289,7 +289,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "ネットワークからブロックされているようです。これは MAC スプーフィングに関係する場合があります。詳細については、 <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC スプーフィングのドキュメント</a>をご覧ください。" #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -298,25 +298,25 @@ msgstr "Tailsのこのバージョンには、既知のセキュリティ問題 #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "ネットワークカード ${nic} が無効になりました" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗したので、一時的に無効化されます。\nTails を再起動して、 MAC スプーフィーングを無効化したいかもしれません。<a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>ドキュメント</a>をご覧ください。" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "" +msgstr "全ネットワーク機能無効" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗しました。エラーリカバリも失敗したので、全ネットワーク機能が無効になります。 Tails を再起動して、 MAC スプーフィングを無効化したいと思うかもしれません。<a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>ドキュメント</a>をご覧ください。" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -451,7 +451,7 @@ msgstr "Tailsのドキュメント" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Tails の使い方を知る" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network "

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit b927923e8ff43a4ce4d7bf75a038e8f3017731b5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 09:46:26 2014 +0000 Update translations for tails-misc --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index 05a5d3f..4083042 100644 --- a/fr.po +++ b/fr.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 09:13+0000\n" +"PO-Revision-Date: 2014-03-07 09:20+0000\n" "Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Mar '14

commit bc7956cee7ff24d2245e493c70376f4089398c0f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 09:46:13 2014 +0000 Update translations for tails-greeter_completed --- fr/fr.po | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 0ba2d3c..7d6f341 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# chioubaca <chioubaca(a)gmail.com>, 2014 # Emmanuel Sd <emanwebdev(a)gmail.com>, 2014 # matsa <matsa(a)riseup.net>, 2013 # Onizuka, 2013 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 10:02+0000\n" -"Last-Translator: Emmanuel Sd <emanwebdev(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-07 09:33+0000\n" +"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,8 +39,8 @@ msgid "Use persistence?" msgstr "Activer la persistance ?" #: ../glade/persistencewindow.glade.h:5 -msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Aide</a>" +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation (en)</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -72,8 +73,8 @@ msgstr "Mot de passe d'administration" #: ../glade/optionswindow.glade.h:4 msgid "" "<a " -"href=\"doc/first_steps/startup_options/administration_password.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Aide</a>" +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation (en)</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -94,14 +95,14 @@ msgid "Passwords do not match" msgstr "Les mots de passe ne concordent pas" #: ../glade/optionswindow.glade.h:10 -msgid "Windows Camouflage" -msgstr "Windows Camouflage" +msgid "Windows camouflage" +msgstr "Camouflage Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " -"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Aide</a>" +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation (en)</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -118,8 +119,10 @@ msgid "MAC address spoofing" msgstr "Usurpation d'adresse MAC" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Aide (en)</a>" +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation (en)</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -137,6 +140,28 @@ msgstr "Il est généralement plus sûr d'usurper les adresses MAC, mais cela pe msgid "Spoof all MAC addresses" msgstr "Usurper toutes les adresses MAC" +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Configuration réseau" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation (en)</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "La connexion internet de cet ordinateur est libre de tout obstacle. Vous pouvez vous connecter directement au réseau Tor." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "La connexion internet de cet ordinateur est censurée, filtrée ou passe par un proxy. Vous devez configurer la passerelle, le pare-feu ou les paramètres du proxy." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0