February 2012 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Feb '12

14 Feb '12

commit 83ab60c70b401fbd0a3b63def5402b0e1716a7f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 14 10:15:08 2012 +0000 Update translations for bridgedb --- ar/bridgedb.po | 2 +- ca/bridgedb.po | 2 +- cs/bridgedb.po | 2 +- da/bridgedb.po | 2 +- de/bridgedb.po | 2 +- eo/bridgedb.po | 2 +- es/bridgedb.po | 2 +- eu/bridgedb.po | 2 +- fa/bridgedb.po | 2 +- fr/bridgedb.po | 2 +- he/bridgedb.po | 2 +- hr_HR/bridgedb.po | 2 +- hu/bridgedb.po | 2 +- it/bridgedb.po | 2 +- ko/bridgedb.po | 2 +- nl/bridgedb.po | 2 +- pl_PL/bridgedb.po | 2 +- pt_BR/bridgedb.po | 2 +- ru/bridgedb.po | 2 +- sl_SI/bridgedb.po | 2 +- sv/bridgedb.po | 2 +- templates/bridgedb.pot | 2 +- tr/bridgedb.po | 2 +- zh_CN/bridgedb.po | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ar/bridgedb.po b/ar/bridgedb.po index fcdbe4b..6bb6292 100644 --- a/ar/bridgedb.po +++ b/ar/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: محمد الحرقان <malham1(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/ca/bridgedb.po b/ca/bridgedb.po index 1648cce..3c9f25a 100644 --- a/ca/bridgedb.po +++ b/ca/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Toni Hermoso Pulido <toniher(a)softcatala.cat>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/cs/bridgedb.po b/cs/bridgedb.po index a54f8d5..1f2188a 100644 --- a/cs/bridgedb.po +++ b/cs/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/da/bridgedb.po b/da/bridgedb.po index da9e60f..c0bfbfa 100644 --- a/da/bridgedb.po +++ b/da/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: OliverMller <theoliver(a)live.co.uk>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/de/bridgedb.po b/de/bridgedb.po index 3a7283a..854d4f4 100644 --- a/de/bridgedb.po +++ b/de/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Locke <locke(a)dena-design.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/eo/bridgedb.po b/eo/bridgedb.po index da6f403..2968de1 100644 --- a/eo/bridgedb.po +++ b/eo/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: identity <eeemsi(a)googlemail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/es/bridgedb.po b/es/bridgedb.po index 7113bf5..fc52b67 100644 --- a/es/bridgedb.po +++ b/es/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: NinjaTuna <nort0ngh0st(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/eu/bridgedb.po b/eu/bridgedb.po index 6ea44df..a35bff3 100644 --- a/eu/bridgedb.po +++ b/eu/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/fa/bridgedb.po b/fa/bridgedb.po index c94b08f..7544f24 100644 --- a/fa/bridgedb.po +++ b/fa/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: arashaalaei <aalaeiarash(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/fr/bridgedb.po b/fr/bridgedb.po index 640bef6..42e4353 100644 --- a/fr/bridgedb.po +++ b/fr/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: mehditaileb <mehditaileb(a)liberte-info.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/he/bridgedb.po b/he/bridgedb.po index 10d7706..64c392b 100644 --- a/he/bridgedb.po +++ b/he/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: static172 <static.172(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/hr_HR/bridgedb.po b/hr_HR/bridgedb.po index 3cdcdb2..a20bcf3 100644 --- a/hr_HR/bridgedb.po +++ b/hr_HR/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Armando Vega <synaan(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/hu/bridgedb.po b/hu/bridgedb.po index 557e14a..500eee5 100644 --- a/hu/bridgedb.po +++ b/hu/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/it/bridgedb.po b/it/bridgedb.po index 10ec53c..65747e9 100644 --- a/it/bridgedb.po +++ b/it/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: fetidyoo <tru74368(a)yahoo.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/ko/bridgedb.po b/ko/bridgedb.po index e34b45c..74a7b3a 100644 --- a/ko/bridgedb.po +++ b/ko/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/nl/bridgedb.po b/nl/bridgedb.po index 35f0088..ff13fc5 100644 --- a/nl/bridgedb.po +++ b/nl/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Shondoit Walker <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/pl_PL/bridgedb.po b/pl_PL/bridgedb.po index cb82c4f..d144505 100644 --- a/pl_PL/bridgedb.po +++ b/pl_PL/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/pt_BR/bridgedb.po b/pt_BR/bridgedb.po index d2fced4..dc70b51 100644 --- a/pt_BR/bridgedb.po +++ b/pt_BR/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: n3t0 <>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/ru/bridgedb.po b/ru/bridgedb.po index 403113a..a505da0 100644 --- a/ru/bridgedb.po +++ b/ru/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/sl_SI/bridgedb.po b/sl_SI/bridgedb.po index d6d81d1..a216b29 100644 --- a/sl_SI/bridgedb.po +++ b/sl_SI/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: marko <mr.marko(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/sv/bridgedb.po b/sv/bridgedb.po index 0a202a0..180bc32 100644 --- a/sv/bridgedb.po +++ b/sv/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Petomatick <petomatick(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot index 8f543c0..8314599 100644 --- a/templates/bridgedb.pot +++ b/templates/bridgedb.pot @@ -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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/tr/bridgedb.po b/tr/bridgedb.po index 6eef04c..46cbe22 100644 --- a/tr/bridgedb.po +++ b/tr/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: Tekel Bira <psycookie(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/zh_CN/bridgedb.po b/zh_CN/bridgedb.po index f90a541..9bce198 100644 --- a/zh_CN/bridgedb.po +++ b/zh_CN/bridgedb.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-13 10:11+0000\n" +"PO-Revision-Date: 2012-02-14 10:04+0000\n" "Last-Translator: hanl <iamh4n(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

r25425: {website} Answer some FAQs about JavaScript in TBB (website/trunk/docs/en)
by Robert Ransom 14 Feb '12

14 Feb '12

Author: rransom Date: 2012-02-14 09:59:53 +0000 (Tue, 14 Feb 2012) New Revision: 25425 Modified: website/trunk/docs/en/faq.wml Log: Answer some FAQs about JavaScript in TBB Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2012-02-14 09:47:38 UTC (rev 25424) +++ website/trunk/docs/en/faq.wml 2012-02-14 09:59:53 UTC (rev 25425) @@ -61,6 +61,8 @@ go?</a></li> <li><a href="#TBBOtherExtensions">Can I install other Firefox extensions?</a></li> + <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to allow JavaScript by default in the Tor Browser Bundle? Isn't that unsafe?</a></li> + <li><a href="#TBBCanIBlockJS">I'm an expert! (No, really!) Can I configure NoScript to block JavaScript by default?</a></li> <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc with Tor.</a></li> <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle @@ -850,6 +852,41 @@ <hr> +<a id="TBBJavaScriptEnabled"></a> +<h3><a class="anchor" href="#TBBJavaScriptEnabled">Why is NoScript configured to allow JavaScript by default in the Tor Browser Bundle? Isn't that unsafe?</a></h3> + +<p> +We configure NoScript to allow JavaScript by default in the Tor +Browser Bundle because many websites will not work with JavaScript +disabled. Most users would give up on Tor entirely if a website +they want to use requires JavaScript, because they would not know +how to allow a website to use JavaScript (or that enabling +JavaScript might make a website work). +</p> + +<hr> + +<a id="TBBCanIBlockJS"></a> +<h3><a class="anchor" href="#CanIBlockJS">I'm an expert! (No, really!) Can I configure NoScript to block JavaScript by default?</a></h3> + +<p> +You can configure your copies of Tor Browser Bundle however you want +to. However, we recommend that even users who know how to use +NoScript leave JavaScript enabled if possible, because a website or +exit node can easily distinguish users who disable JavaScript from +users who use Tor Browser bundle with its default settings (thus +users who disable JavaScript are less anonymous). +</p> + +<p> +Disabling JavaScript by default, then allowing a few websites to run +scripts, is especially bad for your anonymity: the set of websites +which you allow to run scripts is very likely to <em>uniquely</em> +identify your browser. +</p> + +<hr> + <a id="TBBOtherBrowser"></a> <h3><a class="anchor" href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc with Tor.</a></h3>

1 0

r25424: {website} I bet arma wanted mirror 2 to say mirror 2 (website/trunk/projects/en)
by Sebastian Hahn 14 Feb '12

14 Feb '12

Author: sebastian Date: 2012-02-14 09:47:38 +0000 (Tue, 14 Feb 2012) New Revision: 25424 Modified: website/trunk/projects/en/obfsproxy.wml Log: I bet arma wanted mirror 2 to say mirror 2 Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-14 01:49:38 UTC (rev 25423) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-14 09:47:38 UTC (rev 25424) @@ -81,7 +81,7 @@ (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.torrent">torrent</a>), - <a href="http://mit.edu/arma/Public/obfsprxy_osx.zip">mirror 1</a> (<a href="http://mit.edu/arma/Public/obfsprxy_osx.zip.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_osx.torrent">torrent</a>). + <a href="http://mit.edu/arma/Public/obfsprxy_osx.zip">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_osx.zip.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_osx.torrent">torrent</a>). </p> <p>

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 14 Feb '12

14 Feb '12

commit eebac0cb6fde159f988df25ed62b519a2ba45383 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 14 09:45:30 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index b84c6fb..3884f22 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.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: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-14 09:11+0000\n" +"PO-Revision-Date: 2012-02-14 09:18+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2133,7 +2133,7 @@ msgstr "Copier" msgctxt "MessageLog" msgid "Copy the selected messages to the clipboard (Ctrl+C)" -msgstr "Copier les messages sélectionnés dans le Presse Papier (Ctrl+C)" +msgstr "Copier les messages sélectionnés dans le presse-papier (Ctrl+C)" msgctxt "MessageLog" msgid "Ctrl+C" @@ -2866,7 +2866,7 @@ msgstr "" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "Débit moyen" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" @@ -2878,11 +2878,11 @@ msgstr "Ko/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "Débit maximal" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" -msgstr "" +msgstr "Pic maximal de la bande passante" msgctxt "ServerPage" msgid "" @@ -2972,7 +2972,7 @@ msgstr "" msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard" -msgstr "" +msgstr "Copier l'identité de votre passerelle dans le presse-papier" msgctxt "ServerPage" msgid "No Recent Usage" @@ -3120,7 +3120,7 @@ msgstr "Créé par Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "Copier dans le Presse Papier" +msgstr "Copier dans le presse-papier" msgctxt "StatusEventWidget" msgid "The Tor Software is Running"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 14 Feb '12

14 Feb '12

commit 09031d75303fc433dbf0270a4cac763ac6b411e5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 14 09:15:24 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 110 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 55 insertions(+), 55 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index a87da42..b84c6fb 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.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: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-13 21:37+0000\n" +"PO-Revision-Date: 2012-02-14 09:11+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -281,7 +281,7 @@ msgstr "Graphique de la bande passante" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Démarrage de la demande du pont HTTPS ..." +msgstr "Démarrage de la demande de passerelle HTTPS ..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -289,23 +289,23 @@ msgstr "Connexion à %1:%2 ..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Envoi une demande de liste de ponts HTTPS..." +msgstr "Envoi une demande de liste de passerelles HTTPS..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Téléchargement d'une liste de ponts ..." +msgstr "Téléchargement d'une liste de passerelles..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Téléchargement des ponts" +msgstr "Téléchargement des passerelles" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "Impossible de télécharger les ponts : %1" +msgstr "Impossible de télécharger les passerelles : %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Nouvelle tentative de demande de pont ..." +msgstr "Nouvelle tentative de demande de passerelle ..." msgctxt "BridgeUsageDialog" msgid "Country" @@ -321,7 +321,7 @@ msgstr "Les clients des pays suivants ont utilisé votre relai depuis %1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "Résumé de l'utilisation du pont" +msgstr "Résumé de l'utilisation de la passerelle" msgctxt "BridgeUsageDialog" msgid "Client Summary" @@ -1593,7 +1593,7 @@ msgstr "Error" msgctxt "LogEvent" msgid "Unknown" -msgstr "Unknown" +msgstr "Inconnu" msgctxt "LogTreeItem" msgid "Debug" @@ -1617,7 +1617,7 @@ msgstr "Error" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "Unknown" +msgstr "Inconnu" msgctxt "MainWindow" msgid "Start Tor" @@ -2424,7 +2424,7 @@ msgstr "Pas de détails disponibles pour le relai sélectionné." msgctxt "NetViewer" msgid "Unknown" -msgstr "Unknown" +msgstr "Inconnu" msgctxt "NetViewer" msgid "Full Screen" @@ -2456,11 +2456,11 @@ msgstr "Statut" msgctxt "NetworkPage" msgid "Invalid Bridge" -msgstr "Pont invalide" +msgstr "Passerelle invalide" msgctxt "NetworkPage" msgid "The specified bridge identifier is not valid." -msgstr "L'identifiant du pont défini est invalide." +msgstr "L'identifiant de la passerelle défini est invalide." msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" @@ -2530,7 +2530,7 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "Cochez pour chiffrer les demandes d'annuaire et, facultativement, utilisez les relais pont pour accéder au réseau Tor." +msgstr "Cochez pour chiffrer les demandes d'annuaire et, facultativement, utilisez les relais passerelles pour accéder au réseau Tor." msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" @@ -2538,19 +2538,19 @@ msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau To msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Paramètres du Pont" +msgstr "Paramètres de la passerelle" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "Ajouter un pont :" +msgstr "Ajouter une passerelle :" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" -msgstr "" +msgstr "Supprimer les passerelles sélectionnées de la liste" msgctxt "NetworkPage" msgid "Copy the selected bridges to the clipboard" -msgstr "" +msgstr "Copier les passerelles sélectionnées dans le presse-papier" msgctxt "NetworkPage" msgid "Find Bridges Now" @@ -2562,7 +2562,7 @@ msgstr "" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" -msgstr "" +msgstr "<a href=\"bridges.finding\">Comment puis-je trouver des passerelles ?</a>" msgctxt "NetworkPage" msgid "" @@ -2604,67 +2604,67 @@ msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" -msgstr "" +msgstr "accepter" msgctxt "Policy" msgid "reject" -msgstr "" +msgstr "rejeter" msgctxt "RouterDescriptor" msgid "Online" -msgstr "" +msgstr "En ligne" msgctxt "RouterDescriptor" msgid "Hibernating" -msgstr "" +msgstr "Hibernation" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "" +msgstr "Hors ligne" msgctxt "RouterDescriptorView" msgid "Location:" -msgstr "" +msgstr "Localisation :" msgctxt "RouterDescriptorView" msgid "IP Address:" -msgstr "" +msgstr "Adresse IP :" msgctxt "RouterDescriptorView" msgid "Platform:" -msgstr "" +msgstr "Plateforme :" msgctxt "RouterDescriptorView" msgid "Bandwidth:" -msgstr "" +msgstr "Bande passante :" msgctxt "RouterDescriptorView" msgid "Uptime:" -msgstr "" +msgstr "Durée de fonctionnement :" msgctxt "RouterDescriptorView" msgid "Last Updated:" -msgstr "" +msgstr "Dernière mise à jour :" msgctxt "RouterDescriptorView" msgid "Copy" -msgstr "" +msgstr "Copier" msgctxt "RouterInfoDialog" msgid "Hibernating" -msgstr "" +msgstr "En hibernation" msgctxt "RouterInfoDialog" msgid "Online" -msgstr "" +msgstr "En ligne" msgctxt "RouterInfoDialog" msgid "Offline" -msgstr "" +msgstr "Hors ligne" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "Inconnu" msgctxt "RouterInfoDialog" msgid "Relay Details" @@ -2672,7 +2672,7 @@ msgstr "Détails du relai" msgctxt "RouterInfoDialog" msgid "Summary" -msgstr "" +msgstr "Résumé" msgctxt "RouterInfoDialog" msgid "Name:" @@ -2684,7 +2684,7 @@ msgstr "État :" msgctxt "RouterInfoDialog" msgid "Location:" -msgstr "" +msgstr "Localisation :" msgctxt "RouterInfoDialog" msgid "IP Address:" @@ -2692,35 +2692,35 @@ msgstr "Adresse IP :" msgctxt "RouterInfoDialog" msgid "Platform:" -msgstr "" +msgstr "Plateforme :" msgctxt "RouterInfoDialog" msgid "Bandwidth:" -msgstr "" +msgstr "Bande passante :" msgctxt "RouterInfoDialog" msgid "Uptime:" -msgstr "" +msgstr "Durée de fonctionnement :" msgctxt "RouterInfoDialog" msgid "Contact:" -msgstr "" +msgstr "Contact :" msgctxt "RouterInfoDialog" msgid "Last Updated:" -msgstr "" +msgstr "Dernière mise à jour :" msgctxt "RouterInfoDialog" msgid "Descriptor" -msgstr "" +msgstr "Identifiant" msgctxt "RouterListItem" msgid "Offline" -msgstr "" +msgstr "Hors ligne" msgctxt "RouterListItem" msgid "Hibernating" -msgstr "" +msgstr "Hibernation" msgctxt "RouterListItem" msgid "%1 KB/s" @@ -2748,7 +2748,7 @@ msgstr "Surnom" msgctxt "RouterListWidget" msgid "Fingerprint" -msgstr "" +msgstr "Empreinte" msgctxt "ServerPage" msgid "Bridge Support Unavailable" @@ -2892,7 +2892,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "Limites de la bande passante" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" @@ -2924,7 +2924,7 @@ msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 et 8888" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "Messagerie instantanée (IM)" msgctxt "ServerPage" msgid "Port 443" @@ -2959,7 +2959,7 @@ msgstr "" msgctxt "ServerPage" msgid "Exit Policies" -msgstr "" +msgstr "Politiques de sortie" msgctxt "ServerPage" msgid "Let others access your bridge by giving them this line:" @@ -2976,7 +2976,7 @@ msgstr "" msgctxt "ServerPage" msgid "No Recent Usage" -msgstr "" +msgstr "Pas d'utilisation récente" msgctxt "ServerPage" msgid "No clients have used your relay recently." @@ -2990,7 +2990,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bridge History" -msgstr "" +msgstr "Historique de la Passerelle" msgctxt "ServerPage" msgid "Vidalia was unable to retrieve your bridge's usage history." @@ -3004,7 +3004,7 @@ msgstr "" msgctxt "ServerPage" msgid "The returned response was: %1" -msgstr "" +msgstr "La réponse renvoyée était: %1" msgctxt "ServerPage" msgid "Help censored users reach the Tor network" @@ -3012,7 +3012,7 @@ msgstr "Aide les utilisateurs censurés a accéder au réseau Tor" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "" +msgstr "<a href=\"#bridgeUsage\">Qui a utilisé ma passerelle ?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" @@ -3020,7 +3020,7 @@ msgstr "" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Diffuser automatiquement l'adresse de ma passerelle" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" @@ -3413,7 +3413,7 @@ msgstr "" msgctxt "Stream" msgid "Unknown" -msgstr "" +msgstr "Inconnu" msgctxt "TorControl" msgid ""

1 0

r25423: {website} add the ORG mobile broadband bits. (website/trunk/press/en)
by Andrew Lewman 14 Feb '12

14 Feb '12

Author: phobos Date: 2012-02-14 01:49:38 +0000 (Tue, 14 Feb 2012) New Revision: 25423 Modified: website/trunk/press/en/inthemedia.wml Log: add the ORG mobile broadband bits. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-02-14 01:44:30 UTC (rev 25422) +++ website/trunk/press/en/inthemedia.wml 2012-02-14 01:49:38 UTC (rev 25423) @@ -70,6 +70,16 @@ </tr> <tr> <td>2012 Jan 24</td> +<td>PC Pro UK</td> +<td><a href="http://www.pcpro.co.uk/news/372391/o2-plays-down-accusations-of-tor-censors…">O2 plays down accusations of Tor censorship</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2012 Jan 24</td> +<td>Broadband Choice UK</td> +<td><a href="http://www.broadbandchoice.co.uk/news/org-says-mobile-broadband-providers-a…">ORG says mobile broadband providers are blocking Tor</a></td> +</td> +<tr> +<td>2012 Jan 24</td> <td>PC Welt</td> <td><a href="http://www.pcwelt.de/news/SSL-Verschluesselung-HTTPS-Everywhere-in-neuer-Ve…">HTTPS Everywhere in neuer Version</a></td> </tr>

1 0

r25422: {website} and add a dutch story. (website/trunk/press/en)
by Andrew Lewman 14 Feb '12

14 Feb '12

Author: phobos Date: 2012-02-14 01:44:30 +0000 (Tue, 14 Feb 2012) New Revision: 25422 Modified: website/trunk/press/en/inthemedia.wml Log: and add a dutch story. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-02-13 23:52:28 UTC (rev 25421) +++ website/trunk/press/en/inthemedia.wml 2012-02-14 01:44:30 UTC (rev 25422) @@ -34,6 +34,16 @@ </thead> <tr style="background-color: #e5e5e5;"> <td>2012 Feb 13</td> +<td>IDG NL webwereld</td> +<td><a href="http://webwereld.nl/nieuws/109501/iraanse-overheid-frustreert-https-verkeer…">Iraanse overheid frustreert https-verkeer</a></td> +</tr> +<tr> +<td>2012 Feb 13</td> +<td>Ars Technica</td> +<td><a href="http://arstechnica.com/tech-policy/news/2012/02/tors-latest-project-helps-i…">Tor's latest project helps Iran get back online despite new Internet censorship regime</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2012 Feb 13</td> <td>Radio Farda</td> <td><a href="http://www.radiofarda.com/content/f3_tor_goes_to_war_against_filtering_with…">«تور» با پروژه‌ای جدید به جنگ فیلترینگ در ایران می‌رود "</a></td> </td>

1 0

r25421: {website} osx mirror2 is up (website/trunk/projects/en)
by Roger Dingledine 13 Feb '12

13 Feb '12

Author: arma Date: 2012-02-13 23:52:28 +0000 (Mon, 13 Feb 2012) New Revision: 25421 Modified: website/trunk/projects/en/obfsproxy.wml Log: osx mirror2 is up Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-13 22:10:38 UTC (rev 25420) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-13 23:52:28 UTC (rev 25421) @@ -80,7 +80,8 @@ <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">OSX (10.6 & 10.7) Obfsproxy Tor Browser Bundle</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or - <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.torrent">torrent</a>). + <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_osx.zip.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_osx.torrent">torrent</a>), + <a href="http://mit.edu/arma/Public/obfsprxy_osx.zip">mirror 1</a> (<a href="http://mit.edu/arma/Public/obfsprxy_osx.zip.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_osx.torrent">torrent</a>). </p> <p>

1 0

[tor/master] ht.h comment tweaks, upstreamed from libevent
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 1e9400d9c865f06df2e644d42f25b0c61607fdf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 17:56:13 2012 -0500 ht.h comment tweaks, upstreamed from libevent --- src/common/ht.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/ht.h b/src/common/ht.h index 0850c07..3f374b4 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -431,9 +431,8 @@ ht_string_hash(const char *s) /* * Copyright 2005, Nick Mathewson. Implementation logic is adapted from code * by Christopher Clark, retrofit to allow drop-in memory management, and to - * use the same interface as Niels Provos's HT_H. I'm not sure whether this - * is a derived work any more, but whether it is or not, the license below - * applies. + * use the same interface as Niels Provos's tree.h. This is probably still + * a derived work, so the original license below still applies. * * Copyright (c) 2002, Christopher Clark * All rights reserved.

1 0

[tor/master] Port over the last ht.h changes from libevent: avoid _reserved identifiers
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit a31fb42d2e5aed07748effc5ec765b7478a84bba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 18:40:30 2012 -0500 Port over the last ht.h changes from libevent: avoid _reserved identifiers --- src/common/container.c | 8 ++-- src/common/ht.h | 72 ++++++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 81a946a..23ec9d3 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -1027,7 +1027,7 @@ digestmap_set(digestmap_t *map, const char *key, void *val) * the hash table that we do in the unoptimized code above. (Each of * HT_INSERT and HT_FIND calls HT_SET_HASH and HT_FIND_P.) */ - _HT_FIND_OR_INSERT(digestmap_impl, node, digestmap_entry_hash, &(map->head), + HT_FIND_OR_INSERT_(digestmap_impl, node, digestmap_entry_hash, &(map->head), digestmap_entry_t, &search, ptr, { /* we found an entry. */ @@ -1041,7 +1041,7 @@ digestmap_set(digestmap_t *map, const char *key, void *val) tor_malloc_zero(sizeof(digestmap_entry_t)); memcpy(newent->key, key, DIGEST_LEN); newent->val = val; - _HT_FOI_INSERT(node, &(map->head), &search, newent, ptr); + HT_FOI_INSERT_(node, &(map->head), &search, newent, ptr); return NULL; }); #endif @@ -1354,14 +1354,14 @@ digestmap_free(digestmap_t *map, void (*free_val)(void*)) void strmap_assert_ok(const strmap_t *map) { - tor_assert(!_strmap_impl_HT_REP_IS_BAD(&map->head)); + tor_assert(!strmap_impl_HT_REP_IS_BAD_(&map->head)); } /** Fail with an assertion error if anything has gone wrong with the internal * representation of <b>map</b>. */ void digestmap_assert_ok(const digestmap_t *map) { - tor_assert(!_digestmap_impl_HT_REP_IS_BAD(&map->head)); + tor_assert(!digestmap_impl_HT_REP_IS_BAD_(&map->head)); } /** Return true iff <b>map</b> has no entries. */ diff --git a/src/common/ht.h b/src/common/ht.h index 12977cb..f7d4ce1 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -102,24 +102,24 @@ ht_string_hash(const char *s) } #ifndef HT_NO_CACHE_HASH_VALUES -#define _HT_SET_HASH(elm, field, hashfn) \ +#define HT_SET_HASH_(elm, field, hashfn) \ do { (elm)->field.hte_hash = hashfn(elm); } while (0) -#define _HT_SET_HASHVAL(elm, field, val) \ +#define HT_SET_HASHVAL_(elm, field, val) \ do { (elm)->field.hte_hash = (val); } while (0) -#define _HT_ELT_HASH(elm, field, hashfn) \ +#define HT_ELT_HASH_(elm, field, hashfn) \ ((elm)->field.hte_hash) #else -#define _HT_SET_HASH(elm, field, hashfn) \ +#define HT_SET_HASH_(elm, field, hashfn) \ ((void)0) -#define _HT_ELT_HASH(elm, field, hashfn) \ +#define HT_ELT_HASH_(elm, field, hashfn) \ (hashfn(elm)) -#define _HT_SET_HASHVAL(elm, field, val) \ +#define HT_SET_HASHVAL_(elm, field, val) \ ((void)0) #endif /* Helper: alias for the bucket containing 'elm'. */ -#define _HT_BUCKET(head, field, elm, hashfn) \ - ((head)->hth_table[_HT_ELT_HASH(elm,field,hashfn) % head->hth_table_length]) +#define HT_BUCKET_(head, field, elm, hashfn) \ + ((head)->hth_table[HT_ELT_HASH_(elm,field,hashfn) % head->hth_table_length]) #define HT_FOREACH(x, name, head) \ for ((x) = HT_START(name, head); \ @@ -129,7 +129,7 @@ ht_string_hash(const char *s) #define HT_PROTOTYPE(name, type, field, hashfn, eqfn) \ int name##_HT_GROW(struct name *ht, unsigned min_capacity); \ void name##_HT_CLEAR(struct name *ht); \ - int _##name##_HT_REP_IS_BAD(const struct name *ht); \ + int name##_HT_REP_IS_BAD_(const struct name *ht); \ static INLINE void \ name##_HT_INIT(struct name *head) { \ head->hth_table_length = 0; \ @@ -141,12 +141,12 @@ ht_string_hash(const char *s) /* Helper: returns a pointer to the right location in the table \ * 'head' to find or insert the element 'elm'. */ \ static INLINE struct type ** \ - _##name##_HT_FIND_P(struct name *head, struct type *elm) \ + name##_HT_FIND_P_(struct name *head, struct type *elm) \ { \ struct type **p; \ if (!head->hth_table) \ return NULL; \ - p = &_HT_BUCKET(head, field, elm, hashfn); \ + p = &HT_BUCKET_(head, field, elm, hashfn); \ while (*p) { \ if (eqfn(*p, elm)) \ return p; \ @@ -161,8 +161,8 @@ ht_string_hash(const char *s) { \ struct type **p; \ struct name *h = (struct name *) head; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(h, elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(h, elm); \ return p ? *p : NULL; \ } \ /* Insert the element 'elm' into the table 'head'. Do not call this \ @@ -174,8 +174,8 @@ ht_string_hash(const char *s) if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \ name##_HT_GROW(head, head->hth_n_entries+1); \ ++head->hth_n_entries; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = &_HT_BUCKET(head, field, elm, hashfn); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = &HT_BUCKET_(head, field, elm, hashfn); \ elm->field.hte_next = *p; \ *p = elm; \ } \ @@ -188,8 +188,8 @@ ht_string_hash(const char *s) struct type **p, *r; \ if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \ name##_HT_GROW(head, head->hth_n_entries+1); \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(head, elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(head, elm); \ r = *p; \ *p = elm; \ if (r && (r!=elm)) { \ @@ -207,8 +207,8 @@ ht_string_hash(const char *s) name##_HT_REMOVE(struct name *head, struct type *elm) \ { \ struct type **p, *r; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(head,elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(head,elm); \ if (!p || !*p) \ return NULL; \ r = *p; \ @@ -269,7 +269,7 @@ ht_string_hash(const char *s) if ((*elm)->field.hte_next) { \ return &(*elm)->field.hte_next; \ } else { \ - unsigned b = (_HT_ELT_HASH(*elm, field, hashfn) % head->hth_table_length)+1; \ + unsigned b = (HT_ELT_HASH_(*elm, field, hashfn) % head->hth_table_length)+1; \ while (b < head->hth_table_length) { \ if (head->hth_table[b]) \ return &head->hth_table[b]; \ @@ -281,7 +281,7 @@ ht_string_hash(const char *s) static INLINE struct type ** \ name##_HT_NEXT_RMV(struct name *head, struct type **elm) \ { \ - unsigned h = _HT_ELT_HASH(*elm, field, hashfn); \ + unsigned h = HT_ELT_HASH_(*elm, field, hashfn); \ *elm = (*elm)->field.hte_next; \ --head->hth_n_entries; \ if (*elm) { \ @@ -338,7 +338,7 @@ ht_string_hash(const char *s) elm = head->hth_table[b]; \ while (elm) { \ next = elm->field.hte_next; \ - b2 = _HT_ELT_HASH(elm, field, hashfn) % new_len; \ + b2 = HT_ELT_HASH_(elm, field, hashfn) % new_len; \ elm->field.hte_next = new_table[b2]; \ new_table[b2] = elm; \ elm = next; \ @@ -356,7 +356,7 @@ ht_string_hash(const char *s) for (b=0; b < head->hth_table_length; ++b) { \ struct type *e, **pE; \ for (pE = &new_table[b], e = *pE; e != NULL; e = *pE) { \ - b2 = _HT_ELT_HASH(e, field, hashfn) % new_len; \ + b2 = HT_ELT_HASH_(e, field, hashfn) % new_len; \ if (b2 == b) { \ pE = &e->field.hte_next; \ } else { \ @@ -386,7 +386,7 @@ ht_string_hash(const char *s) /* Debugging helper: return false iff the representation of 'head' is \ * internally consistent. */ \ int \ - _##name##_HT_REP_IS_BAD(const struct name *head) \ + name##_HT_REP_IS_BAD_(const struct name *head) \ { \ unsigned n, i; \ struct type *elm; \ @@ -408,9 +408,9 @@ ht_string_hash(const char *s) return 5; \ for (n = i = 0; i < head->hth_table_length; ++i) { \ for (elm = head->hth_table[i]; elm; elm = elm->field.hte_next) { \ - if (_HT_ELT_HASH(elm, field, hashfn) != hashfn(elm)) \ + if (HT_ELT_HASH_(elm, field, hashfn) != hashfn(elm)) \ return 1000 + i; \ - if ((_HT_ELT_HASH(elm, field, hashfn) % head->hth_table_length) != i) \ + if ((HT_ELT_HASH_(elm, field, hashfn) % head->hth_table_length) != i) \ return 10000 + i; \ ++n; \ } \ @@ -423,24 +423,24 @@ ht_string_hash(const char *s) /** Implements an over-optimized "find and insert if absent" block; * not meant for direct usage by typical code, or usage outside the critical * path.*/ -#define _HT_FIND_OR_INSERT(name, field, hashfn, head, eltype, elm, var, y, n) \ +#define HT_FIND_OR_INSERT_(name, field, hashfn, head, eltype, elm, var, y, n) \ { \ - struct name *_##var##_head = head; \ - struct eltype **var; \ - if (!_##var##_head->hth_table || \ - _##var##_head->hth_n_entries >= _##var##_head->hth_load_limit) \ - name##_HT_GROW(_##var##_head, _##var##_head->hth_n_entries+1); \ - _HT_SET_HASH((elm), field, hashfn); \ - var = _##name##_HT_FIND_P(_##var##_head, (elm)); \ + struct name *var##_head_ = head; \ + struct eltype **var; \ + if (!var##_head_->hth_table || \ + var##_head_->hth_n_entries >= var##_head_->hth_load_limit) \ + name##_HT_GROW(var##_head_, var##_head_->hth_n_entries+1); \ + HT_SET_HASH_((elm), field, hashfn); \ + var = name##_HT_FIND_P_(var##_head_, (elm)); \ if (*var) { \ y; \ } else { \ n; \ } \ } -#define _HT_FOI_INSERT(field, head, elm, newent, var) \ +#define HT_FOI_INSERT_(field, head, elm, newent, var) \ { \ - _HT_SET_HASHVAL(newent, field, (elm)->field.hte_hash); \ + HT_SET_HASHVAL_(newent, field, (elm)->field.hte_hash); \ newent->field.hte_next = NULL; \ *var = newent; \ ++((head)->hth_n_entries); \

1 0