- tor-commits - lists.torproject.org

r24913: {} two new languages for the website from transifex: Arabic (Sa (in translation/trunk/projects/website/po: . ar_SA ar_SA/about ar_SA/docs ar_SA/getinvolved ar_SA/projects hu hu/getinvolved hu/torbutton)
by Runa Sandvik 20 Jul '11

20 Jul '11

Author: runa Date: 2011-07-20 22:01:51 +0000 (Wed, 20 Jul 2011) New Revision: 24913 Added: translation/trunk/projects/website/po/ar_SA/ translation/trunk/projects/website/po/ar_SA/about/ translation/trunk/projects/website/po/ar_SA/about/3-low.translators.po translation/trunk/projects/website/po/ar_SA/docs/ translation/trunk/projects/website/po/ar_SA/docs/2-medium.installguide.po translation/trunk/projects/website/po/ar_SA/getinvolved/ translation/trunk/projects/website/po/ar_SA/getinvolved/3-low.mirrors.po translation/trunk/projects/website/po/ar_SA/projects/ translation/trunk/projects/website/po/ar_SA/projects/3-low.puppettor.po translation/trunk/projects/website/po/hu/ translation/trunk/projects/website/po/hu/getinvolved/ translation/trunk/projects/website/po/hu/getinvolved/3-low.mirrors.po translation/trunk/projects/website/po/hu/torbutton/ translation/trunk/projects/website/po/hu/torbutton/3-low.index.po Log: two new languages for the website from transifex: Arabic (Saudi Arabia) and Hungarian Added: translation/trunk/projects/website/po/ar_SA/about/3-low.translators.po =================================================================== --- translation/trunk/projects/website/po/ar_SA/about/3-low.translators.po (rev 0) +++ translation/trunk/projects/website/po/ar_SA/about/3-low.translators.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,146 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# mohammad alhargan <malham1(a)hotmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"PO-Revision-Date: 2011-07-15 00:44+0000\n" +"Last-Translator: malhargan <malham1(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_SA\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/about/en/translators.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page " +"about/volunteers>\">Translators</a>" +msgstr "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page " +"about/volunteers>\">Translators</a>" + +#. type: Content of: <div><div><h1> +#: /home/runa/transifex/website/about/en/translators.wml:13 +msgid "Translators" +msgstr "المترجمون" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:15 +msgid "Bogdan Drozdowski" +msgstr "Bogdan Drozdowski" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:15 +msgid "Polish" +msgstr "Polish" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:16 +msgid "Tiago Faria" +msgstr "Tiago Faria" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:16 +msgid "Portuguese." +msgstr "Portuguese." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:17 +msgid "fredzupy" +msgstr "fredzupy" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:17 +msgid "French" +msgstr "French" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:18 +msgid "Jens Kubieziel and Oliver Knapp" +msgstr "Jens Kubieziel and Oliver Knapp" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:18 +msgid "German" +msgstr "German" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:19 +msgid "Pei Hanru and bridgefish" +msgstr "Pei Hanru and bridgefish" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:19 +msgid "Simplified Chinese" +msgstr "Simplified Chinese" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:20 +msgid "Jan Reister" +msgstr "Jan Reister" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:20 +msgid "Italian" +msgstr "Italian" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:21 +msgid "ygrek and an anonymous translator" +msgstr "ygrek and an anonymous translator" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:21 +msgid "Russian" +msgstr "Russian" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:22 +msgid "Ghazal Teheri" +msgstr "Ghazal Teheri" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:22 +msgid "Persian" +msgstr "Persian" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:23 +msgid "Htaike Htaike Aung" +msgstr "Htaike Htaike Aung" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:23 +msgid "Burmese" +msgstr "Burmese" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:24 +msgid "Osama Khalid" +msgstr "Osama Khalid" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:24 +msgid "Arabic" +msgstr "العربية" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/transifex/website/about/en/translators.wml:25 +msgid "Alexia Prichard" +msgstr "Alexia Prichard" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/transifex/website/about/en/translators.wml:25 +msgid "Spanish" +msgstr "Spanish" + + Added: translation/trunk/projects/website/po/ar_SA/docs/2-medium.installguide.po =================================================================== --- translation/trunk/projects/website/po/ar_SA/docs/2-medium.installguide.po (rev 0) +++ translation/trunk/projects/website/po/ar_SA/docs/2-medium.installguide.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,41 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# mohammad alhargan <malham1(a)hotmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"PO-Revision-Date: 2011-07-15 00:53+0000\n" +"Last-Translator: malhargan <malham1(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_SA\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/docs/en/installguide.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"docs/documentation>\">Documentation » </a> <a href=\"<page " +"docs/installguide>\">Installation Guides</a>" +msgstr "" +"صفحة <a href = \"<Pageindex>\"> الرئيسية »</ أ> صفحة <a href =\" " +"<Pagedocs/documentation> \"> الوثائق» </ أ> صفحة <a href = " +"\"<Pagedocs/installguide>\" > دلائل التثبيت </ أ>" + +#. type: Content of: <div><div><h1> +#: /home/runa/transifex/website/docs/en/installguide.wml:13 +msgid "Tor Installation guides" +msgstr "دليل تثبيت تور" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/docs/en/installguide.wml:14 +msgid "<br>" +msgstr "<br>" + + Added: translation/trunk/projects/website/po/ar_SA/getinvolved/3-low.mirrors.po =================================================================== --- translation/trunk/projects/website/po/ar_SA/getinvolved/3-low.mirrors.po (rev 0) +++ translation/trunk/projects/website/po/ar_SA/getinvolved/3-low.mirrors.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,109 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# mohammad alhargan <malham1(a)hotmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"PO-Revision-Date: 2011-07-15 00:52+0000\n" +"Last-Translator: malhargan <malham1(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_SA\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"getinvolved/mirrors>\">Mirrors</a>" +msgstr "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"getinvolved/mirrors>\">Mirrors</a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:12 +msgid "Tor: Mirrors" +msgstr "تور : مرآة" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:13 +msgid "<hr>" +msgstr "<hr>" + +#. type: Content of: <div><div><p> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:16 +msgid "" +"The canonical URL of this site is <a " +"href=\"https://www.torproject.org/\">https://www.torproject.org/</a>, but " +"there are a few mirrors of this site in other places." +msgstr "" +"العنوان المعروف لهذا الموقع هو <a " +"href=\"https://www.torproject.org/\">https://www.torproject.org/</a>, ، ولكن" +" هناك عدد قليل من المرايا لهذا الموقع في أماكن اخرى." + +#. type: Content of: <div><div><p> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:22 +msgid "" +"If you would like to run a mirror, please <a href=\"<page " +"docs/running-a-mirror>\">read our instructions for running a mirror</a>." +msgstr "" +"إذا كنت ترغب في تشغيل المرآة، يرجى زيارة الصفحة <a href = " +"\"<Pagedocs/running-a-mirror>\"> وقراءة تعليمات تشغيل المرآة </ A>." + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:28 +msgid "Country" +msgstr "بلد" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:29 +msgid "Organisation" +msgstr "منظمة" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:30 +msgid "Status" +msgstr "الولاية" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:31 +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:32 +msgid "http dist/" +msgstr "http dist/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:33 +msgid "http website" +msgstr "HTTP موقع" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:34 +msgid "https dist/" +msgstr "https dist/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:35 +msgid "https website" +msgstr "https موقع" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:36 +msgid "rsync dist/" +msgstr "rsync dist/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:37 +msgid "rsync website" +msgstr "rsync موقع" + + Added: translation/trunk/projects/website/po/ar_SA/projects/3-low.puppettor.po =================================================================== --- translation/trunk/projects/website/po/ar_SA/projects/3-low.puppettor.po (rev 0) +++ translation/trunk/projects/website/po/ar_SA/projects/3-low.puppettor.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,41 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# mohammad alhargan <malham1(a)hotmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"PO-Revision-Date: 2011-07-15 00:40+0000\n" +"Last-Translator: malhargan <malham1(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_SA\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/projects/en/puppettor.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"projects/projects>\">Projects » </a> <a href=\"<page " +"projects/projects>\">Sample Project</a>" +msgstr "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"projects/projects>\">Projects » </a> <a href=\"<page " +"projects/projects>\">Sample Project</a>" + +#. type: Content of: <div><div><h1> +#: /home/runa/transifex/website/projects/en/puppettor.wml:14 +msgid "Sample Tor Project" +msgstr "عينة المشروع تور" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/projects/en/puppettor.wml:15 +msgid "Here is some information" +msgstr "هنا بعض المعلومات" + + Added: translation/trunk/projects/website/po/hu/getinvolved/3-low.mirrors.po =================================================================== --- translation/trunk/projects/website/po/hu/getinvolved/3-low.mirrors.po (rev 0) +++ translation/trunk/projects/website/po/hu/getinvolved/3-low.mirrors.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,109 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# <viktor.varga(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"PO-Revision-Date: 2011-07-16 12:20+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu_HU\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"getinvolved/mirrors>\">Mirrors</a>" +msgstr "" +"<a href=\"<page index>\">Kezdőlap » </a> <a href=\"<page " +"getinvolved/mirrors>\">Tükrözések</a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:12 +msgid "Tor: Mirrors" +msgstr "Tor: Tükrözések" + +#. type: Content of: <div><div> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:13 +msgid "<hr>" +msgstr "<hr>" + +#. type: Content of: <div><div><p> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:16 +msgid "" +"The canonical URL of this site is <a " +"href=\"https://www.torproject.org/\">https://www.torproject.org/</a>, but " +"there are a few mirrors of this site in other places." +msgstr "" +"A központi címe Tennek az oldalnak <a " +"href=\"https://www.torproject.org/\">https://www.torproject.org/</a>, de " +"létezik több tükre ennek az oldalnak máshol is." + +#. type: Content of: <div><div><p> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:22 +msgid "" +"If you would like to run a mirror, please <a href=\"<page " +"docs/running-a-mirror>\">read our instructions for running a mirror</a>." +msgstr "" +"Ha szeretne tükrözést végezni kérjük <a href=\"<page " +"docs/running-a-mirror>\">olvassa el a tükrözési útmutatónkat</a>." + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:28 +msgid "Country" +msgstr "Ország" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:29 +msgid "Organisation" +msgstr "Szervezet" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:30 +msgid "Status" +msgstr "Állapot" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:31 +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:32 +msgid "http dist/" +msgstr "http csomag/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:33 +msgid "http website" +msgstr "http weboldal" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:34 +msgid "https dist/" +msgstr "http csomag/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:35 +msgid "https website" +msgstr "http weboldal" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:36 +msgid "rsync dist/" +msgstr "rsync csomag/" + +#. type: Content of: <div><div><table><tr><th> +#: /home/runa/transifex/website/getinvolved/en/mirrors.wml:37 +msgid "rsync website" +msgstr "rsync weboldal" + + Added: translation/trunk/projects/website/po/hu/torbutton/3-low.index.po =================================================================== --- translation/trunk/projects/website/po/hu/torbutton/3-low.index.po (rev 0) +++ translation/trunk/projects/website/po/hu/torbutton/3-low.index.po 2011-07-20 22:01:51 UTC (rev 24913) @@ -0,0 +1,240 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# <viktor.varga(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-06-21 08:19+0200\n" +"PO-Revision-Date: 2011-07-16 12:12+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu_HU\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/torbutton/en/index.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"torbutton/index>\">Torbutton</a>" +msgstr "" +"<a href=\"<page index>\">Kezdőlap » </a> <a href=\"<page " +"torbutton/index>\">Torbutton</a>" + +#. type: Attribute 'title' of: <div><div><link> +#: /home/runa/tor/website/torbutton/en/index.wml:14 +msgid "Google Canada" +msgstr "Google Canada" + +#. type: Attribute 'title' of: <div><div><link> +#: /home/runa/tor/website/torbutton/en/index.wml:15 +msgid "Google UK" +msgstr "Google UK" + +#. type: Attribute 'title' of: <div><div><link> +#: /home/runa/tor/website/torbutton/en/index.wml:16 +msgid "Google USA" +msgstr "Google USA" + +#. type: Content of: <div><div><script> +#: /home/runa/tor/website/torbutton/en/index.wml:19 +msgid "" +"function addSearchProvider(prov) { try { " +"window.external.AddSearchProvider(prov); } catch (e) { alert(\"Search " +"plugins require Firefox 2\"); return; } } function " +"addEngine(name,ext,cat,pid) { if ((typeof window.sidebar == \"object\") && " +"(typeof window.sidebar.addSearchEngine == \"function\")) { " +"window.sidebar.addSearchEngine( \"http://mycroft.mozdev.org/install.php/\" +" +" pid + \"/\" + name + \".src\", \"http://mycroft.mozdev.org/install.php/\" +" +" pid + \"/\" + name + \".\"+ ext, name, cat ); } else { alert(\"You will " +"need a browser which supports Sherlock to install this plugin.\"); } } " +"function addOpenSearch(name,ext,cat,pid,meth) { if ((typeof window.external" +" == \"object\") && ((typeof window.external.AddSearchProvider == " +"\"unknown\") || (typeof window.external.AddSearchProvider == \"function\")))" +" { if ((typeof window.external.AddSearchProvider == \"unknown\") && meth == " +"\"p\") { alert(\"This plugin uses POST which is not currently supported by " +"Internet Explorer's implementation of OpenSearch.\"); } else { " +"window.external.AddSearchProvider( " +"\"http://mycroft.mozdev.org/installos.php/\" + pid + \"/\" + name + " +"\".xml\"); } } else { alert(\"You will need a browser which supports " +"OpenSearch to install this plugin.\"); } } function " +"addOpenSearch2(name,ext,cat,pid,meth) { if ((typeof window.external == " +"\"object\") && ((typeof window.external.AddSearchProvider == \"unknown\") ||" +" (typeof window.external.AddSearchProvider == \"function\"))) { if ((typeof " +"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { " +"alert(\"This plugin uses POST which is not currently supported by Internet " +"Explorer's implementation of OpenSearch.\"); } else { " +"window.external.AddSearchProvider( " +"\"http://torbutton.torproject.org/dev/search/\" + name + \".xml\"); } } else" +" { alert(\"You will need a browser which supports OpenSearch to install this" +" plugin.\"); } } function install (aEvent) { var params = { \"Torbutton\": " +"{ URL: aEvent.target.href, Hash: aEvent.target.getAttribute(\"hash\"), " +"toString: function () { return this.URL; } } }; " +"InstallTrigger.install(params); return false; }" +msgstr "" +"function addSearchProvider(prov) { try { " +"window.external.AddSearchProvider(prov); } catch (e) { alert(\"Search " +"plugins require Firefox 2\"); return; } } function " +"addEngine(name,ext,cat,pid) { if ((typeof window.sidebar == \"object\") && " +"(typeof window.sidebar.addSearchEngine == \"function\")) { " +"window.sidebar.addSearchEngine( \"http://mycroft.mozdev.org/install.php/\" +" +" pid + \"/\" + name + \".src\", \"http://mycroft.mozdev.org/install.php/\" +" +" pid + \"/\" + name + \".\"+ ext, name, cat ); } else { alert(\"Egy olyan " +"böngészőre van szüksége, amely támogatja a Sherlock-ot ennek a kiegészítőnek" +" a telepítéséhez.\"); } } function addOpenSearch(name,ext,cat,pid,meth) { " +"if ((typeof window.external == \"object\") && ((typeof " +"window.external.AddSearchProvider == \"unknown\") || (typeof " +"window.external.AddSearchProvider == \"function\"))) { if ((typeof " +"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { " +"alert(\"Ez a kiegészítő POST metódust használ, ami jelenleg nem támogatott " +"az Internet Explorer OpenSearch megvalósításában.\"); } else { " +"window.external.AddSearchProvider( " +"\"http://mycroft.mozdev.org/installos.php/\" + pid + \"/\" + name + " +"\".xml\"); } } else { alert(\"Olyan böngészőre van szükésge amely támogatja " +"az OpenSearch-öt a kiegészítő telepítéséhez.\"); } } function " +"addOpenSearch2(name,ext,cat,pid,meth) { if ((typeof window.external == " +"\"object\") && ((typeof window.external.AddSearchProvider == \"unknown\") ||" +" (typeof window.external.AddSearchProvider == \"function\"))) { if ((typeof " +"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { " +"alert(\"Ez a kiegészítő POST metódust használ, ami jelenleg nem támogatott " +"az Internet Explorer OpenSearch megvalósításában.\"); } else { " +"window.external.AddSearchProvider( " +"\"http://torbutton.torproject.org/dev/search/\" + name + \".xml\"); } } else" +" { alert(\"Olyan böngészőre van szükésge amely támogatja az OpenSearch-öt a " +"kiegészítő telepítéséhez.\"); } } function install (aEvent) { var params = " +"{ \"Torbutton\": { URL: aEvent.target.href, Hash: " +"aEvent.target.getAttribute(\"hash\"), toString: function () { return " +"this.URL; } } }; InstallTrigger.install(params); return false; }" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/torbutton/en/index.wml:86 +msgid "Torbutton" +msgstr "Torbutton" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/torbutton/en/index.wml:87 +msgid "" +"<hr> <strong>Current stable version:</strong><version-torbutton><br/> " +"<strong>Current alpha version:</strong><version-torbutton-alpha><br/> <br/> " +"<strong>Authors:</strong> Mike Perry & Scott Squires<br/> <br/> " +"<strong>Install Stable:</strong> Click to <a " +"href=\"https://www.torproject.org/dist/torbutton/torbutton-current.xpi\" " +"hash=\"<version-hash-torbutton>\" onclick=\"return install(event);\">install" +" from this website</a>.<br/> <strong>Install Alpha:</strong> Click to <a " +"href=\"https://www.torproject.org/dist/torbutton/torbutton-current-" +"alpha.xpi\" hash=\"<version-hash-torbutton-alpha>\" onclick=\"return " +"install(event);\">install from this website</a> <br/> <strong>English Google" +" Search:</strong> Google search plugins for <a href=\"/jsreq.html\" " +"title=\"Ref: 14938 (googleCA)\" " +"onClick=\"addOpenSearch('GoogleCanada','ico','General','14937','g');return " +"false\">Google CA</a>, and <a href=\"/jsreq.html\" title=\"Ref: 14938 " +"(googleCA)\" " +"onClick=\"addOpenSearch('googleuk_web','png','General','14445','g');return " +"false\">Google UK</a>. <br/> <strong>Past Releases:</strong> <a " +"href=\"https://archive.torproject.org/tor-package-archive/torbutton/\">Tor " +"Archive</a><br/> <br/> <strong>Developer Documentation:</strong> <a " +"href=\"en/design/index.html.en\">Torbutton Design Document</a> and <a " +"href=\"en/design/MozillaBrownBag.pdf\">Slides (Not actively " +"updated)</a><br/> <strong>Source:</strong> You can <a " +"href=\"https://gitweb.torproject.org/torbutton.git\">browse the " +"repository</a> or simply unzip the xpi. <br/> <strong>Bug Reports:</strong>" +" <a href=\"https://trac.torproject.org/projects/tor/report/14\">Torproject " +"Bug Tracker</a><br/> <strong>Documents:</strong> <b>[</b> <a href=\"<page " +"torbutton/torbutton-faq>\">FAQ</a> <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG\">changelog</a>" +" <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE\">license</a>" +" <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS\">credits</a>" +" <b>]</b><br/> <br/>" +msgstr "" +"<hr> <strong>Aktuális stabil verzió:</strong><version-torbutton><br/> " +"<strong>Aktuális alfa verzió:</strong><version-torbutton-alpha><br/> <br/> " +"<strong>Authors:</strong> Mike Perry & Scott Squires<br/> <br/> " +"<strong>Stabil verzió telepítése::</strong> Kattintson <a " +"href=\"https://www.torproject.org/dist/torbutton/torbutton-current.xpi\" " +"hash=\"<version-hash-torbutton>\" onclick=\"return install(event);\">a " +"telepítéshez erről a weboldalról</a>.<br/> <strong>Alfa verzió:</strong> " +"Kattintson <a href=\"https://www.torproject.org/dist/torbutton/torbutton-" +"current-alpha.xpi\" hash=\"<version-hash-torbutton-alpha>\" onclick=\"return" +" install(event);\">a telepítéshez erről a weboldalról</a> <br/> " +"<strong>Angol Google keresés:</strong> Google kereső kiegészítők az <a " +"href=\"/jsreq.html\" title=\"Ref: 14938 (googleCA)\" " +"onClick=\"addOpenSearch('GoogleCanada','ico','General','14937','g');return " +"false\">Google CA</a>, and <a href=\"/jsreq.html\" title=\"Ref: 14938 " +"(googleCA)\" " +"onClick=\"addOpenSearch('googleuk_web','png','General','14445','g');return " +"false\">Google UK</a>. <br/> <strong>Past Releases:</strong> <a " +"href=\"https://archive.torproject.org/tor-package-archive/torbutton/\">Tor " +"Arhívum</a><br/> <br/> <strong>Fejlesztői dokumentáció:</strong> <a " +"href=\"en/design/index.html.en\">Torbutton tervezés dokumentáció</a> and <a " +"href=\"en/design/MozillaBrownBag.pdf\">Képek (Nincs rendszeresen " +"frissítve)</a><br/> <strong>Forráskód:</strong> You can <a " +"href=\"https://gitweb.torproject.org/torbutton.git\">tallózza a " +"repository-t</a> vagy egyszerűen csomagolja ki az xpi fájlt. <br/> " +"<strong>Hibabejelentések:</strong> <a " +"href=\"https://trac.torproject.org/projects/tor/report/14\">Torproject " +"Hibakövető</a><br/> <strong>Dokumentumok:</strong> <b>[</b> <a href=\"<page " +"torbutton/torbutton-faq>\">GYIK</a> <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG\">változásjegyzék</a>" +" <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE\">licensz</a>" +" <b>|</b> <a " +"href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS\">készítők</a>" +" <b>]</b><br/> <br/>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/torbutton/en/index.wml:127 +msgid "" +"Torbutton is a 1-click way for Firefox users to enable or disable the " +"browser's use of <a href=\"<page index>\">Tor</a>. It adds a panel to the " +"statusbar that says \"Tor Enabled\" (in green) or \"Tor Disabled\" (in red)." +" The user may click on the panel to toggle the status. If the user (or " +"some other extension) changes the proxy settings, the change is " +"automatically reflected in the statusbar." +msgstr "" +"A Torbutton egy 1-gombos lehetőség a Firefox felhasználók részére, hogy be " +"és kikapcsolhassák a <a href=\"<page index>\">Tor</a> programot. Az " +"állapotsorhoz ad hozzá egy panelt, ami a \"Tor bekapcsolva\" (zöld színben) " +"vagy a \"Tor kikapcsolva\" (piros színben) állapotot jeleníti meg. Ha a " +"felhasználó rákattint a panelra, meg tudja változtani állapotát. Ha a " +"felhasználó (vagy egy egyéb kiegészítés) átállítja a proxy beállításokat a " +"beállítások azonnal megjelennek ezen az állapot jelzőn." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/torbutton/en/index.wml:136 +msgid "" +"To keep you safe, Torbutton disables many types of active content. You can " +"learn more from the <a href=\"<page torbutton/torbutton-faq>\">Torbutton " +"FAQ</a>, or read more details in the <a href=\"<page torbutton/torbutton-" +"options>\">Torbutton options</a> list." +msgstr "" +"Ahhoz, hogy biztonságban böngészhessen a Torbutton letilt több aktív " +"tartalmat. Ezekről bővebb infromációt a <a href=\"<page torbutton" +"/torbutton-faq>\">Torbutton Gyakori kérdések</a> oldalán találhat, illetve " +"további részletekről tájékozódhat a <a href=\"<page torbutton/torbutton-" +"options>\">Torbutton beállítások </a> listájában is." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/torbutton/en/index.wml:143 +msgid "" +"Some users may prefer a toolbar button instead of a statusbar panel. " +"Torbutton lets you add a toolbar button by right-clicking on the desired " +"toolbar, selecting \"Customize...\", and then dragging the Torbutton icon " +"onto the toolbar. There is an option in the preferences to hide the " +"statusbar panel (Tools->Extensions, select Torbutton, and click on " +"Preferences)." +msgstr "" +"Néhány felhasználó valószínűleg jobban kedveli az Eszköztár gombokat, mint " +"egy panelt az állapotsorban. A Torbutton lehetővé teszi, hogy egy eszköztár" +" gombot adjon hozzá bármelyik eszköztárhoz, aon jobb gombbal kattintva, és a" +" \"Testreszabás...\" opciót választva, majd a Torbutton ikont ráhúzva az " +"eszköztárra. A panel elrejthető az állapot soron. (Az Eszközök -> " +"Kiegészítők, Torbutton kiválasztása, Beállítások gombra kattintással.)" + +

1 0

r24912: {translation} updated translation templates for the website (in translation/trunk/projects/website/po/templates: docs download getinvolved)
by Runa Sandvik 20 Jul '11

20 Jul '11

Author: runa Date: 2011-07-20 19:45:37 +0000 (Wed, 20 Jul 2011) New Revision: 24912 Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian.pot translation/trunk/projects/website/po/templates/download/3-low.download.pot translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot Log: updated translation templates for the website Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-07-20 16:22:54 UTC (rev 24911) +++ translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-07-20 19:45:37 UTC (rev 24912) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"POT-Creation-Date: 2011-07-20 20:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -32,25 +32,25 @@ #. type: Content of: <div><div><h2> #: /home/runa/tor/website/docs/en/debian.wml:14 msgid "" -"<a class=\"anchor\" href=\"#debian\">Option one: Tor on Debian lenny, Debian " -"sid, or Debian testing</a>" +"<a class=\"anchor\" href=\"#debian\">Option one: Tor on Debian squeeze, " +"lenny, Debian sid, or Debian testing</a>" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 -#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/zXFkzQsAWX.xml:42 +#: /tmp/zXFkzQsAWX.xml:113 /tmp/zXFkzQsAWX.xml:148 msgid "<br />" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/debian.wml:19 msgid "" -"If you're using Debian stable (lenny), unstable (sid), or testing (squeeze), " -"just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root." +"If you're using Debian, just run<br /> <tt>apt-get install tor tor-geoipdb</" +"tt> as root." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:26 +#: /home/runa/tor/website/docs/en/debian.wml:25 msgid "" "Note that this might not always give you the latest stable Tor version, but " "you will receive important security fixes. To make sure that you're running " @@ -58,33 +58,34 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 -#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 +#: /home/runa/tor/website/docs/en/debian.wml:31 /tmp/zXFkzQsAWX.xml:94 +#: /tmp/zXFkzQsAWX.xml:139 /tmp/zXFkzQsAWX.xml:182 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:37 +#: /home/runa/tor/website/docs/en/debian.wml:36 msgid "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:41 +#: /home/runa/tor/website/docs/en/debian.wml:40 msgid "" "<a class=\"anchor\" href=\"#ubuntu\">Option two: Tor on Ubuntu or Debian</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:46 +#: /home/runa/tor/website/docs/en/debian.wml:45 msgid "" -"<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained " -"and out of date. That means you'll be missing stability and security fixes." +"<b>Do not use the packages in Ubuntu's universe.</b> In the past they have " +"not reliably been updated. That means you could be missing stability and " +"security fixes." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:52 +#: /home/runa/tor/website/docs/en/debian.wml:51 msgid "" "You'll need to set up our package repository before you can fetch Tor. " "First, you need to figure out the name of your distribution. A quick command " @@ -93,11 +94,16 @@ msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:57 +#: /home/runa/tor/website/docs/en/debian.wml:56 msgid "Debian unstable (sid) is \"sid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:57 +msgid "Debian testing is \"wheezy\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:58 msgid "Debian 6.0 (squeeze) is \"squeeze\"" msgstr "" @@ -132,38 +138,33 @@ msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" -#. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:65 -msgid "Ubuntu 6.06 is \"dapper\"" -msgstr "" - #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:68 +#: /home/runa/tor/website/docs/en/debian.wml:67 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:72 +#: /home/runa/tor/website/docs/en/debian.wml:71 #, no-wrap msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:74 +#: /home/runa/tor/website/docs/en/debian.wml:73 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:80 +#: /home/runa/tor/website/docs/en/debian.wml:79 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:83 +#: /home/runa/tor/website/docs/en/debian.wml:82 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -171,14 +172,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:86 +#: /home/runa/tor/website/docs/en/debian.wml:85 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:89 +#: /home/runa/tor/website/docs/en/debian.wml:88 #, no-wrap msgid "" "apt-get update\n" @@ -186,7 +187,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:101 +#: /home/runa/tor/website/docs/en/debian.wml:100 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -196,19 +197,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:109 +#: /home/runa/tor/website/docs/en/debian.wml:108 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:112 +#: /home/runa/tor/website/docs/en/debian.wml:111 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:116 +#: /home/runa/tor/website/docs/en/debian.wml:115 msgid "" "If you want to use the <a href=\"<page download/download>#packagediff" "\">development branch</a> of Tor instead (more features and more bugs), you " @@ -217,7 +218,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:121 +#: /home/runa/tor/website/docs/en/debian.wml:120 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -225,19 +226,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:124 +#: /home/runa/tor/website/docs/en/debian.wml:123 msgid "" "where you again substitute the name of your distro (lenny, sid, " "maverick, ...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:130 +#: /home/runa/tor/website/docs/en/debian.wml:129 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:132 +#: /home/runa/tor/website/docs/en/debian.wml:131 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -247,17 +248,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:145 +#: /home/runa/tor/website/docs/en/debian.wml:144 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:148 +#: /home/runa/tor/website/docs/en/debian.wml:147 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:152 +#: /home/runa/tor/website/docs/en/debian.wml:151 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -266,7 +267,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:155 +#: /home/runa/tor/website/docs/en/debian.wml:154 #, no-wrap msgid "" "\n" @@ -278,14 +279,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:162 +#: /home/runa/tor/website/docs/en/debian.wml:161 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:165 +#: /home/runa/tor/website/docs/en/debian.wml:164 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -293,12 +294,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:168 +#: /home/runa/tor/website/docs/en/debian.wml:167 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:170 +#: /home/runa/tor/website/docs/en/debian.wml:169 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -309,23 +310,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:176 +#: /home/runa/tor/website/docs/en/debian.wml:175 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:178 +#: /home/runa/tor/website/docs/en/debian.wml:177 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:188 +#: /home/runa/tor/website/docs/en/debian.wml:187 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:190 +#: /home/runa/tor/website/docs/en/debian.wml:189 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot =================================================================== --- translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-20 16:22:54 UTC (rev 24911) +++ translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-20 19:45:37 UTC (rev 24912) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-07-13 14:56+0200\n" +"POT-Creation-Date: 2011-07-20 20:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -175,8 +175,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/eCkycGCH9H.xml:165 -#: /tmp/eCkycGCH9H.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/jgw2tk3no1.xml:165 +#: /tmp/jgw2tk3no1.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -209,7 +209,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/eCkycGCH9H.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/jgw2tk3no1.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -515,7 +515,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/eCkycGCH9H.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/jgw2tk3no1.xml:343 msgid "<br>" msgstr "" @@ -615,12 +615,11 @@ #: /home/runa/tor/website/download/en/download.wml:338 msgid "" "Do not use <a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-" -"isnt-good-idea\">BitTorrent and Tor</a> together unless you are using a " -"system like <a href=\"http://tails.boum.org/\">TAILS</a>." +"isnt-good-idea\">BitTorrent and Tor</a> together." msgstr "" #. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:346 +#: /home/runa/tor/website/download/en/download.wml:345 msgid "" "Be smart and learn more. Understand what Tor does and does not offer. This " "list of pitfalls isn't complete, and we need your help <a href=\"<page " @@ -629,58 +628,58 @@ msgstr "" #. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:358 +#: /home/runa/tor/website/download/en/download.wml:357 msgid "Jump to:" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:360 +#: /home/runa/tor/website/download/en/download.wml:359 msgid "<a href=\"#Windows\">Microsoft Windows</a>" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:361 +#: /home/runa/tor/website/download/en/download.wml:360 msgid "<a href=\"#mac\">Apple OS X</a>" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:362 +#: /home/runa/tor/website/download/en/download.wml:361 msgid "<a href=\"#linux\">Linux/Unix</a>" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:363 +#: /home/runa/tor/website/download/en/download.wml:362 msgid "<a href=\"#smartphones\">Smartphones</a>" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:364 +#: /home/runa/tor/website/download/en/download.wml:363 msgid "<a href=\"#source\">Source Code</a>" msgstr "" #. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:371 +#: /home/runa/tor/website/download/en/download.wml:370 msgid "What is the (sig) link?" msgstr "" #. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:372 +#: /home/runa/tor/website/download/en/download.wml:371 msgid "" "These are GPG signatures to allow you to verify that your downloaded file is " "really from The Tor Project and not an imposter." msgstr "" #. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:375 +#: /home/runa/tor/website/download/en/download.wml:374 msgid "<a href=\"<page docs/verifying-signatures>\">Learn more »</a>" msgstr "" #. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:381 +#: /home/runa/tor/website/download/en/download.wml:380 msgid "Having Trouble?" msgstr "" #. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:383 +#: /home/runa/tor/website/download/en/download.wml:382 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>" msgstr "" Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot =================================================================== --- translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot 2011-07-20 16:22:54 UTC (rev 24911) +++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot 2011-07-20 19:45:37 UTC (rev 24912) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-21 08:19+0200\n" +"POT-Creation-Date: 2011-07-20 20:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -189,19 +189,19 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:86 -#: /tmp/r1AqHDMca8.xml:94 +#: /tmp/iN5ZsD3CzY.xml:94 msgid "Core" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:87 -#: /tmp/r1AqHDMca8.xml:119 +#: /tmp/iN5ZsD3CzY.xml:119 msgid "C" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:88 -#: /tmp/r1AqHDMca8.xml:112 /tmp/r1AqHDMca8.xml:144 /tmp/r1AqHDMca8.xml:184 +#: /tmp/iN5ZsD3CzY.xml:112 /tmp/iN5ZsD3CzY.xml:144 /tmp/iN5ZsD3CzY.xml:184 msgid "Heavy" msgstr "" @@ -217,13 +217,13 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:95 -#: /tmp/r1AqHDMca8.xml:151 /tmp/r1AqHDMca8.xml:183 +#: /tmp/iN5ZsD3CzY.xml:151 /tmp/iN5ZsD3CzY.xml:183 msgid "Java" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:96 -#: /tmp/r1AqHDMca8.xml:192 /tmp/r1AqHDMca8.xml:216 /tmp/r1AqHDMca8.xml:240 +#: /tmp/iN5ZsD3CzY.xml:192 /tmp/iN5ZsD3CzY.xml:216 /tmp/iN5ZsD3CzY.xml:240 msgid "None" msgstr "" @@ -234,19 +234,19 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:102 -#: /tmp/r1AqHDMca8.xml:110 /tmp/r1AqHDMca8.xml:118 /tmp/r1AqHDMca8.xml:126 +#: /tmp/iN5ZsD3CzY.xml:110 /tmp/iN5ZsD3CzY.xml:118 /tmp/iN5ZsD3CzY.xml:126 msgid "Usability" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:103 -#: /tmp/r1AqHDMca8.xml:111 /tmp/r1AqHDMca8.xml:127 +#: /tmp/iN5ZsD3CzY.xml:111 /tmp/iN5ZsD3CzY.xml:127 msgid "Sys Admin" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:104 -#: /tmp/r1AqHDMca8.xml:152 /tmp/r1AqHDMca8.xml:160 /tmp/r1AqHDMca8.xml:224 +#: /tmp/iN5ZsD3CzY.xml:152 /tmp/iN5ZsD3CzY.xml:160 /tmp/iN5ZsD3CzY.xml:224 msgid "Moderate" msgstr "" @@ -272,9 +272,9 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:120 -#: /tmp/r1AqHDMca8.xml:128 /tmp/r1AqHDMca8.xml:136 /tmp/r1AqHDMca8.xml:168 -#: /tmp/r1AqHDMca8.xml:176 /tmp/r1AqHDMca8.xml:200 /tmp/r1AqHDMca8.xml:208 -#: /tmp/r1AqHDMca8.xml:232 +#: /tmp/iN5ZsD3CzY.xml:128 /tmp/iN5ZsD3CzY.xml:136 /tmp/iN5ZsD3CzY.xml:168 +#: /tmp/iN5ZsD3CzY.xml:176 /tmp/iN5ZsD3CzY.xml:200 /tmp/iN5ZsD3CzY.xml:208 +#: /tmp/iN5ZsD3CzY.xml:232 msgid "Light" msgstr "" @@ -300,7 +300,7 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:134 -#: /tmp/r1AqHDMca8.xml:142 /tmp/r1AqHDMca8.xml:150 +#: /tmp/iN5ZsD3CzY.xml:142 /tmp/iN5ZsD3CzY.xml:150 msgid "User Interface" msgstr "" @@ -356,7 +356,7 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:161 -#: /tmp/r1AqHDMca8.xml:177 /tmp/r1AqHDMca8.xml:233 +#: /tmp/iN5ZsD3CzY.xml:177 /tmp/iN5ZsD3CzY.xml:233 msgid "mikeperry" msgstr "" @@ -372,8 +372,8 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:167 -#: /tmp/r1AqHDMca8.xml:175 /tmp/r1AqHDMca8.xml:199 /tmp/r1AqHDMca8.xml:207 -#: /tmp/r1AqHDMca8.xml:223 /tmp/r1AqHDMca8.xml:231 /tmp/r1AqHDMca8.xml:239 +#: /tmp/iN5ZsD3CzY.xml:175 /tmp/iN5ZsD3CzY.xml:199 /tmp/iN5ZsD3CzY.xml:207 +#: /tmp/iN5ZsD3CzY.xml:223 /tmp/iN5ZsD3CzY.xml:231 /tmp/iN5ZsD3CzY.xml:239 msgid "Python" msgstr "" @@ -399,8 +399,8 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:182 -#: /tmp/r1AqHDMca8.xml:190 /tmp/r1AqHDMca8.xml:198 /tmp/r1AqHDMca8.xml:206 -#: /tmp/r1AqHDMca8.xml:214 +#: /tmp/iN5ZsD3CzY.xml:190 /tmp/iN5ZsD3CzY.xml:198 /tmp/iN5ZsD3CzY.xml:206 +#: /tmp/iN5ZsD3CzY.xml:214 msgid "Client Service" msgstr "" @@ -426,7 +426,7 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:201 -#: /tmp/r1AqHDMca8.xml:209 +#: /tmp/iN5ZsD3CzY.xml:209 msgid "kaner" msgstr "" @@ -452,7 +452,7 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:222 -#: /tmp/r1AqHDMca8.xml:230 /tmp/r1AqHDMca8.xml:238 +#: /tmp/iN5ZsD3CzY.xml:230 /tmp/iN5ZsD3CzY.xml:238 msgid "Backend Service" msgstr "" @@ -654,9 +654,9 @@ #. type: Content of: <div><div><h3> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:353 msgid "" -"<a href=\"<page projects/vidalia>\">Vidalia</a> (<a href=\"https://svn." -"torproject.org/vidalia/vidalia/trunk/\">code</a>, <a href=\"https://trac." -"torproject.org/projects/tor/query?" +"<a href=\"<page projects/vidalia>\">Vidalia</a> (<a href=\"https://gitweb." +"torproject.org/vidalia.git\">code</a>, <a href=\"https://trac.torproject.org/" +"projects/tor/query?" "status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Vidalia&order=priority" "\">bug tracker</a>)" msgstr "" @@ -687,9 +687,9 @@ #. type: Content of: <div><div><h3> #: /home/runa/tor/website/getinvolved/en/volunteer.wml:372 msgid "" -"<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a href=\"https://svn." -"torproject.org/svn/arm/trunk/\">code</a>, <a href=\"https://trac.torproject." -"org/projects/tor/query?" +"<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a href=\"https://gitweb." +"torproject.org/arm.git\">code</a>, <a href=\"https://trac.torproject.org/" +"projects/tor/query?" "status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=arm&order=priority" "\">bug tracker</a>)" msgstr "" @@ -718,8 +718,8 @@ #: /home/runa/tor/website/getinvolved/en/volunteer.wml:390 msgid "" "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a href=" -"\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>, " -"<a href=\"https://trac.torproject.org/projects/tor/query?" +"\"https://gitweb.torproject.org/orbot.git\">code</a>, <a href=\"https://trac." +"torproject.org/projects/tor/query?" "status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Orbot&order=priority" "\">bug tracker</a>)" msgstr "" @@ -891,9 +891,9 @@ #: /home/runa/tor/website/getinvolved/en/volunteer.wml:486 msgid "" "<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/" -"EmailAutoResponder\">GetTor</a> (<a href=\"https://svn.torproject.org/svn/" -"projects/gettor/\">code</a>, <a href=\"https://trac.torproject.org/projects/" -"tor/query?" +"EmailAutoResponder\">GetTor</a> (<a href=\"https://gitweb.torproject.org/" +"gettor.git\">code</a>, <a href=\"https://trac.torproject.org/projects/tor/" +"query?" "status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=GetTor&order=priority" "\">bug tracker</a>)" msgstr "" @@ -1905,7 +1905,7 @@ #: /home/runa/tor/website/getinvolved/en/volunteer.wml:1196 msgid "" "The vast majority of arm's more interesting functionality lies in its " -"backend <a href=\"https://svn.torproject.org/svn/arm/trunk/src/util/" +"backend <a href=\"https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util" "\">utilities</a>, so there should be little to no work decoupling the CLI " "from its backend. Instead, this project would mostly be UI hacking and " "experimentation, trying different interfaces to find something that's "

1 0

[tor/master] Do not cannibalize a circuit with isolation values set.
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 5df99cec98c809e919aaca6054cb8b59ff151e41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 14:40:47 2011 -0400 Do not cannibalize a circuit with isolation values set. --- src/or/circuitlist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 0fefe98..48c5afc 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1005,7 +1005,8 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, (!need_capacity || circ->build_state->need_capacity) && (internal == circ->build_state->is_internal) && circ->remaining_relay_early_cells && - !circ->build_state->onehop_tunnel) { + !circ->build_state->onehop_tunnel && + !circ->isolation_values_set) { if (info) { /* need to make sure we don't duplicate hops */ crypt_path_t *hop = circ->cpath;

1 0

[tor/master] Add an OptimisticData option to control client-side optimistic data
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 6e923ed8cdbdcf45902cb64dd921d63dea310d1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 10:38:00 2011 -0400 Add an OptimisticData option to control client-side optimistic data --- changes/optimistic-client | 6 ++++-- doc/tor.1.txt | 10 ++++++++++ src/or/circuituse.c | 17 ++++++++++++++++- src/or/config.c | 1 + src/or/or.h | 4 ++++ 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/changes/optimistic-client b/changes/optimistic-client index 88afb9a..9a21a41 100644 --- a/changes/optimistic-client +++ b/changes/optimistic-client @@ -3,5 +3,7 @@ clients can now "optimistically" send data on a stream before the exit node reports that the stream has opened. This can save a round trip when starting connections with protocols where the - client speaks first. Implements proposal 181; code by Ian - Goldberg. + client speaks first. This behavior is controlled by a (currently + disabled) networkstatus consensus parameter. To turn it on or + off manually, use the "OptimisticData" torrc option. Implements + proposal 181; code by Ian Goldberg. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 821098b..6dc3b28 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -930,6 +930,16 @@ The following options are useful only for clients (that is, if that have the **AllowSingleHopExits** option turned on to build one-hop Tor connections. (Default: 0) +**OptimisticData** **0**|**1**|**auto**:: + When this option is set, and Tor is using an exit node that supports + the feature, it will try optimistically to send data to the exit node + without waiting for the exit node to report whether the connection + succeeded. This can save a round-trip time for protocols like HTTP + where the client talks first. If OptimisticData is set to **auto**, + Tor will look at the UseOptimisticData parameter in the networkstatus. + (Default: auto) + + SERVER OPTIONS -------------- diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 1bc518b..9fbe5fe 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -18,6 +18,7 @@ #include "connection_edge.h" #include "control.h" #include "nodelist.h" +#include "networkstatus.h" #include "policies.h" #include "rendclient.h" #include "rendcommon.h" @@ -1541,6 +1542,19 @@ cpath_is_on_circuit(origin_circuit_t *circ, crypt_path_t *crypt_path) return 0; } +/** Return true iff client-side optimistic data is supported. */ +static int +optimistic_data_enabled(void) +{ + const or_options_t *options = get_options(); + if (options->OptimisticData < 0) { + const int32_t enabled = + networkstatus_get_param(NULL, "UseOptimisticData", 0, 0, 1); + return (int)enabled; + } + return options->OptimisticData; +} + /** Attach the AP stream <b>apconn</b> to circ's linked list of * p_streams. Also set apconn's cpath_layer to <b>cpath</b>, or to the last * hop in circ's cpath if <b>cpath</b> is NULL. @@ -1580,7 +1594,8 @@ link_apconn_to_circ(edge_connection_t *apconn, origin_circuit_t *circ, apconn->cpath_layer->extend_info->identity_digest)) && exitnode->rs) { /* Okay; we know what exit node this is. */ - if (circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL && + if (optimistic_data_enabled() && + circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL && exitnode->rs->version_supports_optimistic_data) apconn->exit_allows_optimistic_data = 1; else diff --git a/src/or/config.c b/src/or/config.c index 96d5095..088617b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -337,6 +337,7 @@ static config_var_t _option_vars[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), V(PortForwardingHelper, FILENAME, "tor-fw-helper"), V(PreferTunneledDirConns, BOOL, "1"), diff --git a/src/or/or.h b/src/or/or.h index 16c7927..c518b4c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3271,6 +3271,10 @@ typedef struct { * once. */ int MaxClientCircuitsPending; + /** If 1, we always send optimistic data when it's supported. If 0, we + * never use it. If -1, we do what the consensus says. */ + int OptimisticData; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/master] For accuracy, s/exit_allows_optimistic_data/may_use_optimistic_data/
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit cd3709a2b093122b8d80f21690edeb0dc69837ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 11:02:39 2011 -0400 For accuracy, s/exit_allows_optimistic_data/may_use_optimistic_data/ --- src/or/circuituse.c | 8 ++++---- src/or/connection_edge.c | 2 +- src/or/or.h | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 9fbe5fe..acfdc23 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -739,7 +739,7 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) tor_assert(conn); conn->cpath_layer = NULL; /* make sure we don't keep a stale pointer */ - conn->exit_allows_optimistic_data = 0; + conn->may_use_optimistic_data = 0; conn->on_circuit = NULL; if (CIRCUIT_IS_ORIGIN(circ)) { @@ -1597,13 +1597,13 @@ link_apconn_to_circ(edge_connection_t *apconn, origin_circuit_t *circ, if (optimistic_data_enabled() && circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL && exitnode->rs->version_supports_optimistic_data) - apconn->exit_allows_optimistic_data = 1; + apconn->may_use_optimistic_data = 1; else - apconn->exit_allows_optimistic_data = 0; + apconn->may_use_optimistic_data = 0; log_info(LD_APP, "Looks like completed circuit to %s %s allow " "optimistic data for connection to %s", safe_str_client(node_describe(exitnode)), - apconn->exit_allows_optimistic_data ? "does" : "doesn't", + apconn->may_use_optimistic_data ? "does" : "doesn't", safe_str_client(apconn->socks_request->address)); } } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 72394e8..a7e3c16 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2372,7 +2372,7 @@ connection_ap_supports_optimistic_data(const edge_connection_t *conn) conn->on_circuit->purpose != CIRCUIT_PURPOSE_C_GENERAL) return 0; - return conn->exit_allows_optimistic_data; + return conn->may_use_optimistic_data; } /** Write a relay begin cell, using destaddr and destport from ap_conn's diff --git a/src/or/or.h b/src/or/or.h index c518b4c..d6d8c7a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1269,9 +1269,10 @@ typedef struct edge_connection_t { unsigned int is_transparent_ap:1; /** For AP connections only: Set if this connection's target exit node - * allows optimistic data. (That is, data sent on this stream before - * the exit has sent a CONNECTED cell.)*/ - unsigned int exit_allows_optimistic_data : 1; + * allows optimistic data (that is, data sent on this stream before + * the exit has sent a CONNECTED cell) and we have chosen to use it. + */ + unsigned int may_use_optimistic_data : 1; /** For AP connections only: buffer for data that we have sent * optimistically, which we might need to re-send if we have to

1 0

[tor/master] Don't assert for listener connections
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 9b0d3719ae3d1e9416cffcce1267fdacfcf765e9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jul 20 19:42:11 2011 +0200 Don't assert for listener connections --- src/or/connection.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index d2ee1ae..c4b320e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3939,6 +3939,9 @@ assert_connection_ok(connection_t *conn, time_t now) case CONN_TYPE_CONTROL: tor_assert(conn->magic == CONTROL_CONNECTION_MAGIC); break; + CASE_ANY_LISTENER_TYPE: + tor_assert(conn->magic == LISTENER_CONNECTION_MAGIC); + break; default: tor_assert(conn->magic == BASE_CONNECTION_MAGIC); break;

1 0

[tor/master] Check for port config before addr config in client port options
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit e05ddf3e18a019b7db833448c666cbf056444d0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:40:09 2011 -0400 Check for port config before addr config in client port options Otherwise, we'll fail, since "9050" looks like a perfectly fine address. --- src/or/config.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7a96304..96d5095 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5039,20 +5039,23 @@ parse_client_port_config(smartlist_t *out, tor_free(addrtmp); goto err; } - } else if (tor_addr_port_parse(addrport, &addr, &ptmp) == 0) { - if (ptmp == 0) { - log_warn(LD_CONFIG, "%sPort line has address but no port", portname); - goto err; - } - port = ptmp; } else { + /* Try parsing integer port before address, because, who knows? + "9050" might be a valid address. */ port = (int) tor_parse_long(addrport, 10, 0, 65535, &ok, NULL); - if (!ok) { + if (ok) { + tor_addr_from_str(&addr, defaultaddr); + } else if (tor_addr_port_parse(addrport, &addr, &ptmp) == 0) { + if (ptmp == 0) { + log_warn(LD_CONFIG, "%sPort line has address but no port", portname); + goto err; + } + port = ptmp; + } else { log_warn(LD_CONFIG, "Couldn't parse address '%s' for %sPort", escaped(addrport), portname); goto err; } - tor_addr_from_str(&addr, defaultaddr); } /* Now parse the rest of the options, if any. */

1 0

[tor/master] Oops: we need to call parse_client_ports with validate_only==0 at least once
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 6fa99ab32feda0e7866b9439fc6644693c56f134 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:35:02 2011 -0400 Oops: we need to call parse_client_ports with validate_only==0 at least once --- src/or/config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1ad4a34..7a96304 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1017,6 +1017,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) #endif if (running_tor) { + int n_client_ports=0; /* We need to set the connection limit before we can open the listeners. */ if (set_max_file_descriptors((unsigned)options->ConnLimit, &options->_ConnLimit) < 0) { @@ -1032,6 +1033,10 @@ options_act_reversible(const or_options_t *old_options, char **msg) libevent_initialized = 1; } + /* Adjust the client port configuration so we can launch listeners. */ + if (parse_client_ports(options, 0, msg, &n_client_ports)) + return -1; + /* Launch the listeners. (We do this before we setuid, so we can bind to * ports under 1024.) We don't want to rebind if we're hibernating. */ if (!we_are_hibernating()) {

1 0

[tor/master] Check return value in fmt_addr
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 718252b253049f84fefa14e212cf560838e6607c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:16:06 2011 -0400 Check return value in fmt_addr Previously, if tor_addr_to_str() returned NULL, we would reuse the last value returned by fmt_addr(). (This could happen if we were erroneously asked to format an AF_UNSPEC address.) Now instead we return "???". --- changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/fmt_addr b/changes/fmt_addr new file mode 100644 index 0000000..b88c9e1 --- /dev/null +++ b/changes/fmt_addr @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When unable to format an address as a string, report its value + as "???" rather than reusing the last formatted address. Bugfix + on 0.2.1.5-alpha. diff --git a/src/common/address.c b/src/common/address.c index 1c72539..7fc7301 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr) { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 1d7beea2ab513c31845abb61d79fb5960b038e4b Merge: 2a6d12c 718252b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:17:59 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc src/common/address.c index d0c2d5e,7fc7301..26a59e9 --- a/src/common/address.c +++ b/src/common/address.c @@@ -958,23 -958,12 +958,25 @@@ fmt_addr(const tor_addr_t *addr { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } +/** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4 + * addresses. Also not thread-safe, also clobbers its return buffer on + * repeated calls. */ +const char * +fmt_addr32(uint32_t addr) +{ + static char buf[INET_NTOA_BUF_LEN]; + struct in_addr in; + in.s_addr = htonl(addr); + tor_inet_ntoa(&in, buf, sizeof(buf)); + return buf; +} + /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string * may be an IPv4 address, an IPv6 address, or an IPv6 address surrounded by * square brackets.

1 0