tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jun '12

23 Jun '12

commit 6d7885403960e2a62a759d77a17da95f44c7c286 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 09:15:05 2012 +0000 Update translations for gettor --- my/gettor.po | 130 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 65 insertions(+), 65 deletions(-) diff --git a/my/gettor.po b/my/gettor.po index 54b3d6c..dbbce78 100644 --- a/my/gettor.po +++ b/my/gettor.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-05-11 04:23+0000\n" +"PO-Revision-Date: 2012-06-23 09:03+0000\n" "Last-Translator: Thura Hlaing <trhura(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -19,38 +19,38 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "áááºá¹ááá¬áá« á áá®áá¬ááá±á¬á·\"Tor ááá°áááº\"áááºáá¯ááºááŒááºáááº" +msgstr "áááºá¹ááá¬áá«á \"GetTor\" áááºáá¯ááº ááŒááºáá«áááºá" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "áááºááá±á¬ááºážááá¯ááŸá¯á¡ááœááºáá»á±ážáá°ážáááºáá«áááºá" +msgstr "áááºá· áá±á¬ááºážááá¯ááŸá¯á¡ááœááº áá»á±ážáá°ážáááºáá«áááºá" #: lib/gettor/i18n.py:31 msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "ááá¯ááááºáá¬ááŒáá·áºáá±ážááŒááºážáááºáá»á¬ážááá¯ ááááºááá±á¬ááºááœá¬ááŒáá·áºáááŒá±âáá±ážááá¯ááºáá« áá¡áááºá áááºáááº GMAIL.COM, YAHOO.COM or YAHOO.CN ááááºáá»á¬ážááŒáá·áºá¡áá¯á¶ážááŒá¯ááá·áºáá«áááºá" +msgstr "á€ááááºáá¬ááŒááºá· áá±ážááŒááºážáá»ááºáá»á¬ážááá¯ ááááºááá±á¬ááºááœá¬ááŒááºá· áá»áœááºááºááá¯á· ááŒá±âáá±ážáááº\n ááá¯ááºáá«á GMAIL.COM, YAHOO.COM (ááá¯á·) YAHOO.CN áááºáá¯áá¯á\n á¡áá±á¬ááºá· ááŒá¯áá¯ááºááŒá®áž áá¬áá±ážááá¯á·ááá¯ááºáááºá" #: lib/gettor/i18n.py:35 msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "\"DKIM\" ááŸá¬áá±á¬ááºáá¶áá±ážáá¬ážááá·áº á¡á®ážáá±ážááºáááºáá±á¬ááºááŸá¯á·áá¯ááºáááºážáááºáá»á¬ážáá¬áá¯ááºáá±á¬ááºááá·áº \"From\"ááœááºáá±ážááá¯á·áá°á¡á¬ážáááºáá±ážááá·áºááááºáá«áááºáááŒáá·áº áááºáá°áá¡á®ážáá±ážááºááá¯á·áááºááá¯ ááááŸáááá¯ááºáá«áááºá" +msgstr "áá»áœááºááºááá¯á·áááº \"DKIM\" áá±á¬ááºáá¶á·áá¬ážáá±á¬ á¡á®ážáá±ážááº áááºáá±á¬ááºááŸá¯ áá¯ááºáááºážáá»á¬ážááŸ\n áá±á¬ááºážááá¯áá»ááºáá»á¬ážááá¯áá¬ ááá¯ááºááœááºáá±ážáááº ááŒááºáááºá áááºážáááº \"From\" ááœááº\n áá«áá±á¬ ááááºáá¬áááº áá±ážááº áá±ážááá¯á·áá° á¡ááŸááºááŒááºááŒá±á¬ááºáž á¡áááºááŒá¯áá±ážááá¯ááºâáááºá·\n á¡á®ážáá±ážááº á¡ááºá¹áá«áááº áááºáá¯ ááŒááºáááºá" #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr " á€áá±ážááºá¡ááœááºááá±ážáá»áŸááº áá»áœááºáá±á¬áºááá¯á·áá±á¬ááºážáááºáá«áááº ááááºáá¡á®ážáá±ážááºáááº DKIM á¡áá¯á¶ážáááŒá¯áá±á¬ááŒá±á¬áá·áºááŒááºáá«áááºááá¯á·á¡ááœááº áá»áœááºáá±á¬áºááá¯á·ááŸááŒá±ááŸááºážáá»áá¡áá»ááºážáá»á¯ááºá¡á¬áž ááá¯á·áá¬ážáá«áááº á€áá±ážááºááááºáá¬á¡á¬áž á¡ááŒá¬ážáááºáá»á¬ážááœááºááŒááºážáááºáá¬ážáá«áááº" +msgstr "(á€áá±ážááºááá¯ áááº ááá±á¬ááºážááá¯áá¬ážáá«á áá»áœááºáá±á¬áºááá¯á· áá±á¬ááºážáááºáá«áááºá\n áááºá· á¡á®ážáá±ážááºáááº DKIM á¡áá¯á¶ážáááŒá¯áá±á¬ áááºáá±á¬ááºááŸá¯ áááºáá¯ ááŒááºáá±á¬ááŒá±á¬ááºá·á\nâááŒá±ááŸááºážáá»ááº á¡áá»ááºážáá»á¯ááº áááºáá¯ááá¯ áá±ážááá¯á·áá¬ážááŒááºáž ááŒááºáááºá \ná€á¡á®ážáá±ážááº ááááºáá¬ááá¯ á¡ááŒá¬áž áááºááœááº áá»ááºáá»á°ááŸá¯áá¬ážáááº ááŒááºáááºá)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "áááºááœááº áá±ážááá¬áá»á¬ážááŸáá·áº Tor ááŸáá·áºáááºáááºááá·áºáá»á¬ážááá¯ á¡á®ážáá±ážááºááááºáá¬ help(a)rt.torproject.org ááá¯á·áááºááœááºáá±ážááŒááºážááá¯ááºáá«áááº á" +msgstr "á¡áááºá áááºá áá±ážááá¬áá»á¬áž ááŸááá«á (ááá¯á·) á¡áá¯ááºááá¯ááºáá«á áá°áá¬áž áááºáŠážáá¶\n á¡áá±á¬ááºá¡âáá¶á· áá±ážáááºá· á¡á®ážáá±ážááºááááºáá¬ help(a)rt.torproject.org áá¶\n ááááºáá¬áá°ááŒá®áž áááº áááºááœááºááá¯ááºáááºá" #: lib/gettor/i18n.py:46 msgid "" @@ -63,19 +63,19 @@ msgid "" " linux-i386\n" " linux-x86_64\n" " source" -msgstr "ááá·áºáá®á¡á¬áž Tor ááá¯ááºáá¯ááºáá»á¬ážááá¯á·áá±ážáááºááŒááºáááŒáá·áº áááºáá¬ááá¯ááá¯áá»ááºááá·áºááá¯áá¬ááá¯ááœááºááŒáá±ážáá«áááºá\ná¡á±á¬ááºááœááºááŒáá¬ážááá·áºááá¯ááºáá¯ááºáá¬áááºáá»á¬ážá¡ááœááºážááŸááœá±ážáá»ááºáááº\n\nwindows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n source" +msgstr "á¡áááºá áááº ááá¯áá»ááºáá±á¬ á¡áá¬ááá¯ ááŒá±á¬áá«áá áááºá·áá¶ Tor áá±á¬á·ááºáá²áá¯ááº áááºáá¯ áá±ážááá¯á·áááºá á¡á±á¬ááºáá« áá±á¬á·ááºáá²áá¯ááº á¡áááºáá»á¬ážáá²á áááºáá¯ááá¯ ááœá±ážáá»ááºáá« -\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n á¡áááºážá¡ááŒááº" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "áá»á±ážáá°ážááŒá¯ááá±ážááºááŒááºááá¯á·áá« ááŒá®ážáá»áŸááºPlease reply to this mail, and tell me a single package name anywhere \nin the body of your email." +msgstr "á€áá±ážááºááá¯ á¡ááŒá±á¬ááºážááŒááºáá«ááŒá®ážá áááºá· á¡á®ážáá±ážááºá áá¬ááá¯ááº áâááºáá±áá¬áá¬á\n áá±á¬á·ááºáá²áá¯ááº áááºáá¯á¡áááºááá¯ áá±á«áºááŒáá«á" #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "TorááœááºáááŸáááá¯ááºááá·áºááŒááºááœááºážáá¯á¶ážáá¬áá¬ááá¬ážá¡áá»áá¯ážá¡áá¬áž " +msgstr "Tor áá¬áá¬ááŒááºááá¯áá»ááº áá¬ážááŸááºážáá»á¬ážááá¯ ááá°áá±áááº\n===================================" #: lib/gettor/i18n.py:62 msgid "" @@ -83,22 +83,22 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "áááºááá¬áá¬ááá¬ážááá¯á·ááŒá±á¬ááºážáááºážáá¬ážááá·áºá¡áá»áá¯ážá¡áá¬ážááá°áááº á áá¬áá¬ážááá¬ážááœá±ážáá»ááºááá°áááºá¡ááœááº áááºáá¡ááºáá¬áááºááááºáá¬á¡á¬áž:\n\n gettor+fa@torprojetct.orgááá¯á·áá±ážááá¯á·áá«á" +msgstr "áááºá· áá¬áá¬ááá¬ážááŒááºá· áá¬áá¬ááŒááºááá¯áá¬ážáá±á¬ Tor áá¬ážááŸááºáž áááºáá¯ááá¯ ááá°áááº\n áááº ááá¯áá»ááºáá±á¬ áá¬áá¬ážááá¬ážááá¯ áá±ážááº áá±ážááá¯á·áááºá· ááááºáá¬\n gettor+fa(a)torprojetct.org á áá±á«áºááŒáá« -" #: lib/gettor/i18n.py:67 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "á€á¥ááá¬áááº ááá·áºá¡á¬áž Farsi (áá«ážááŸááºáž)ááá¯áááºááá¯ááº\nááŒá¯áá¯ááºáá¬ážááá·áºááá¯ááºáá¯ááºáá»á¬ážáá±á¬ááºážááá¯áááºáááºááŒáá¬ážááá·áº á á¡á±á¬ááºááœááº áá±á¬ááºáá¶áá±ážááá¯ááºááá·áº \náá¬áá¬ááá¬ážáá¯ááºáá»á¬ážááááºážááá¯áááºáá±ážááá¯ááºáááºá" +msgstr "á€á¥ááá¬á áá¬ááºááŸá® (áá«ááŸááº) áá¬áá¬ááá¯ áá¬áá¬ááŒááºááá¯áá¬ážáááºá· áá¬ážááŸááºážááŒááºá·\n áááº áá±á¬ááºážááá¯áá¬ážáá±á¬ áá±á¬á·ááºáá²áá¯ááºááá¯ áá±ážá¡ááºáááº ááŒááºáááºá áá±á¬ááºáá¶á·\náá±ážáá¬ážáá±á¬ áá¬áá¬ááá¬áž áá¯ááº áá¬áááºáž áááºáá¯ááá¯ á¡á±á¬ááºááœááº ááŸá¬ááœá±ááá¯ááºáááºá" #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "áá±á¬ááºáá¶áá±ážááá¯ááºááá·áº áá¬áá¬ááá¬ážáá¬áááºáž" +msgstr "áá±á¬ááºáá¶á·áá¬ážáá±á¬ áá±ááá¶ áá¬áá¬ááá¬áž áá¬áááºáž" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" -msgstr "á€áá±áá¬ááœááº á¡áá¯á¶ážááŒá¯ááá¯ááºááá·áºáá¬áá¬ááá¬áž áá¬áááºážáá»á¬ážááŒáá·áºááá¯ááºáá«áááº á" +msgstr "á€áá±áá¬ááœááº ááá°ááá¯ááºáá±á¬ áá¬áá¬ááá¬ážáá»á¬ážá áá¬áááºáž áááºáá¯ ááœá±á·ááŸáááá¯ááºáááº -" #: lib/gettor/i18n.py:75 msgid "" @@ -117,20 +117,20 @@ msgstr " gettor+ar(a)torproject.org: á¡á¬áááº\n gettor+de@torproj #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "áááºááá·áºáá¬áá¬ááá¬ážáá»áŸáááœá±ážáá»ááºáá»ááº á¡ááºá¹áááááºáá¬áá¬ááá¬ážááŒáá·áºáá±á¬áºááŒáá¬ážáááº" +msgstr "á¡áááºá áááºáááºá· áá¬áá¬ááá¬ážááá¯áá»áŸ ááœá±ážáá»ááºááá¬ážáá»áŸááºá á¡ááºá¹áááááº áá¬áá¬ááá¬ážááŒááºá· áááº áááŸááááº ááŒááºáááºá" #: lib/gettor/i18n.py:89 msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "á¡ááœááºá¡áá¬ážá¡áá±ážáááºáá¯á¶ážááá¯ááºáá¯ááºáá»á¬áž \n======================" +msgstr "á¡ááœááº ááá¯á áá±ážáááºáá±á¬ áá±á¬á·ááºáá²áá¯ááºáá»á¬áž \n===========================" #: lib/gettor/i18n.py:92 msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "ááá·áºááœááºáá»á°áá¬áááŒááºááŸá¯ááºážááŸá±ážáá»ááº ááá¯á· áááºáá¡ááºáá¬áááºá¡áá±á¬ááºá¡áá¶áá±ážáá°áááº ááŒá®ážáá¬ážááá·áºáá°ážááœá²áá«ááá¯ááºááá¯ááº/nááá¯á¡á®ážáá±ážááºááááºááá¶áá»áŸááº Torá¡á¬ážááá°á ááŒá®ážáá¬ážááá·áºáá°ážááœá²áá«ááá¯ááºááá¯ááºááŒá®ážá¡áá¬ážá¡ááá¯ááºážááá¯ááºážááœá²á/náá±ážááá¯á·áá«áááº á" +msgstr "á¡áááºá áááºá· bandwith ááááºá·áá±áá»áŸááº (ááá¯á·) á¡ááºáá¬áááº áá¶á·ááá¯ážáá°áááº\náááºá· á¡á®ážáá±ážááºááŒááºá· áá°ážááœá²ááá¯ááºááŒá®ážáá»á¬ážááá¯ ááá°ááœááºá· áááŒá¯áá»áŸááºá GetTor áááºá·\n ááá¯ááºááŒá®ážááŒááºá· ááá±ážáá² ááá¯ááºááá¯ á¡ááá¯ááºážáááºááŒááºá¡á±á¬ááº ááá¯ááºážááŒá®áž áá±ážááá¯á·áá±ážááááºáááºá" #: lib/gettor/i18n.py:96 msgid "" @@ -139,66 +139,66 @@ msgid "" " \n" " windows\n" " split" -msgstr "'split' ááá¯ááá·áº ááá¬ážáá¯á¶ážááá¯ ááá¯ááºážáááºáááºáááºááŒá±á¬ááºážáá¬ážá á€áá²á·ááá¯á· ááá·áºáá«á\n \n windows\n split" +msgstr "'split' ááá¯áááºá· áá¬áá¯á¶ážááá¯ ááá¯ááºážáá±á¬ááºáááºááŒá±á¬ááºážá áááºá·ááœááºážáá« -\n \n windows\n splitááááºááŒááºá·á" #: lib/gettor/i18n.py:102 msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "GetTor á¡á¬ážá€áá¬á¡á¬ážá¡á®ážáá±ážááºááá¯á·ááŒááºážááŒáá·áºááá·áºá¡á¬áž Tor ááá±á¬ááºáá¬ Bundleá¡á¬áž á ááááºáá«ááá¯ááºááŸááá±á¬ áá°ážááœá²áá«ááá¯ááºá¡á¬ážááá¯á·áá±ážáá«áááº" +msgstr "á€áá¬áá¬ážááá¯ GetTor áá¶ á¡á®ážáá±ážááº áá±ážááá¯á·ááŒááºážááŒááºá· Tor Browser Bundle ááá¯\n 1,4MB á¡ááœááºááŸá áá°ážááœá²ááá¯ááºáá»á¬ážáá« áá±ážááá¯á·áááº ááŒááºáááºá" #: lib/gettor/i18n.py:105 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "á¡ááááºá¡ááá¯ááºážá¡á¬ážáá¯á¶ážá¡á¬ážáááŸáááŒá®ážáá»áŸááº áááºáááº ááŒááºáááºáá¯áááºážáááºááá¯á¡ááºááŒá®áž ááá¯ááºáá¯ááºáááºáá¯á¡ááŒááº ááŒááºáááºááŒá¯áá¯ááºáááºááá¯á¡ááºáá«áááº\n á á¡á±á¬ááºááœááºáá±á¬áºááŒáá¬ážááá·áºá¡ááá¯ááºážááŒá¯áá¯ááºááá¯ááºáá«áááº :" +msgstr "á¡ááááºá¡ááá¯ááºáž á¡á¬ážáá¯á¶áž áááŸáááŒá®ážáá«á ááá¯ááºáá¯ááº áááºáá¯ ááŒááºá¡á±á¬ááº\n ááŒááºáá¯áááºážááááº ááŒááºáááºá áááºážááá¯ á¡á±á¬ááºáá«á¡ááá¯ááºáž áá¯ááºáá±á¬ááºááá¯ááºáááº -" #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "áááºáá¶áááŸááá¬ážááá·áº áá°ážááœá²áá«ááá¯ááºá¡á¬ážáá¯á¶ážááá¯ áááºáááœááºáá»á°áá¬á¡ááœááºážááŸá ááá¯ááºááœá²áááºáá¯á¡ááœááºážááá¯á·ááá·áºáááááºážáááºážáá¬ážáá«" +msgstr "á) áááŸááá¬ážáá±á¬ áá°ážááœá²ááá¯ááº á¡á¬ážáá¯á¶ážááá¯ áááºá· ááœááºáá»á°áá¬áá²ááŸá ááá¯ááºááœá² áááºáá¯áá² ááááºážáááºážáá¬ážáá«á" #: lib/gettor/i18n.py:110 msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "\".z\" ááŸáá·áºáá¯á¶ážááá·áºááá¯ááºáá»á¬ážá¡á¬ážáá¯á¶ážá¡á¬ážááŒáá·áºáá«á áááºááœá²áá»áá¬ážááá·áºáá°ážááœá²áá«ááá¯ááºá¡á¬ážáá¯á¶ážá¡á¬ážááá¯ááºááœá²á¡áááºáá²ááá¯á·ááá·áºá ááá¯ááºá¡á¬ážáá¯á¶ážá¡á¬ážá¡ááá¯áá«ááá¯ááºááœá²á¡ááœááºážááá¯á·ááŒáá·áºáá»ááá¯ááºáá« ááááºááá¯á·ááá¯ááºááŒááºááááºááá¯ááááá»áŸááº UNPACKING THE FILES á¡áááºážááœááºááŒáá·áºááá¯ááºáá«áááº á" +msgstr "á) \".z\" ááŒááºá· áá¯á¶ážáá±á¬ ááá¯ááºá¡á¬ážáá¯á¶ážááá¯ ááŒááºáá»áá«á á¡áááºá áá°ážááœá²ááá¯ááº\n á¡á¬ážáá¯á¶ážááá¯ ááá¯ááºááœá²áááºáá²á ááœááºáá²á·áá±á¬ á¡áá»áááºááœááº ááááºážáááºážáá¬ážáá«áá\n ááá¯ááºá¡á¬ážáá¯á¶ážááá¯ áááºážááá¯ááºááœá²áá²á ááŒááºáá»ááá¯ááºáá«á á¡áááºá .z ááá¯ááºáá»á¬áž\n ááŒááºáá»áááºáž ááááá«áá ááá¯ááºáá»á¬áž ááŒááºáá»ááŒááºáž á¡ááá¯ááºážááá¯ áá±á·áá¬áá«á" #: lib/gettor/i18n.py:114 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "á.)ááá¯ááºáá¯ááºáááºáá¯áá»ááºážáá®á¡á¬ážáááºáááºáá¶áá¬ážááá·áºáá±ážááºááœááºááŒáá¬ážááá·áºáá»á¬ážááŒáá·áº\náááºáá±ážáá«á(gpg --verify)" +msgstr "á) áááº áááºáá¶áááŸááá±á¬ áá±ážááºáá²á áá«âáááºá· ááá¯ááºáá¯ááº áááºáá¯áá®ááŸá¬\n áá±á«áºááŒáá¬ážáááºá·á¡ááá¯ááºáž ááá¯ááºá¡á¬ážáá¯á¶ážááá¯ áááºáá±ážáá«á (gpg --verify)" #: lib/gettor/i18n.py:117 msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." -msgstr "á.) \"..split.part01.exe\"ááŒáá·áº á¡áá¯á¶ážáááºááá·áº ááá¯ááºááá¯ áá±á¬ááºááŒáá·áº ááŸááºáá»ááºááŸáááºááŒááºážá¡á¬ážááŒáá·áº á¡ááá¯ááºážáá»á¬ážááœá¬\náá«ááá·áº áá»á¯á¶á·áá¬ážááá·áºááá¯ááºááá¯ ááá¯ááºáááºááá¯ááºáááºážááŒááºáá±áááº ááá¯ ááŒááºááá¯ááºáá«á áááºážááŸá¬ áá¯ááºáááºážáááºááá¯ á¡ááá¯á¡áá»á±á¬ááº\n ááááºááááºá" +msgstr "á) \"..split.part01.exe\" ááŒááºá· á¡áá¯á¶ážáááºáá±á¬ ááá¯ááºááá¯ ááŸááºáá»ááºááŸáááºááŒá®áž\n ááá¯ááºáá¯ááº á¡á¬ážáá¯á¶ážááá¯ áááºááá¯ááºá¡ááŒááº ááŒááºáá»ááá¯ááºáá«á á€áááºážááŒááºá· áá¯ááºáááºáž\ná¡ááá¯á¡áá»á±á¬ááº ááááºáá¬áááº ááŒááºáááºá" #: lib/gettor/i18n.py:121 msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "áááºážáááº" +msgstr "á) ááŒááºáá»ááŸá¯ áá¯ááºáááºáž ááŒá®ážááœá¬ážáá±á¬á¡áá«á ááá¯ááºáááºážááŒá±á¬ááºáž ááá¯ááºááœá²áá²á\n á¡áááºáááºáááº áááºáá®ážááá¯ááºáá±á¬ \".exe\" áááºáá¯ááá¯ áááº ááœá±á·ááááºá\náááºážááá¯ ááŸááºáá»ááºááŸáááºáá»áŸááº ááá¹áááºá·á¡áááºážáááº á¡ááœááºáž Tor Browser Bundle \ná¡áá¯ááºáá¯ááºáá¬áááº ááŒááºáááºá" #: lib/gettor/i18n.py:125 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "áá®áá¬áá«áá² ááááºááá¯ááºáá±á¬ááºááŸá¯áá»á¬ážááŒá®ážáá¯á¶ážáá«ááŒá® áTor ááá¯á¡áá¯á¶ážááŒá¯ááá·áºá¡ááœááºáá»á±ážáá°ážáááºáá«áááº á áá»á±á¬áºááœááºáá«áá±áááºáá»á¬ á" +msgstr "á) áá«áá«áá²á áááº áá¯ááºáááºáž ááŒá®ážááœá¬ážááŒá®á Tor ááá¯ áá¯á¶ážááœá²áááºá·á¡ááœááº áá»á±ážáá°ážáááºáá«áááºá áá»á±á¬áºááœááºáá«áá±á" #: lib/gettor/i18n.py:127 msgid "" "SUPPORT\n" "=======" -msgstr "áá±á¬ááºáá¶ááŸá¯áá»á¬áž\n=======" +msgstr "á¡áá±á¬ááºá¡áá¶á·\n========" #: lib/gettor/i18n.py:133 msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "á€ááá¯ááºáááº áááºáá±á¬ááºážááá¯áá¬ážááá·áºáá±á¬á·ááºáá²á¡á¬áž áá»á¯á¶áá¬ážááá·áºááá¯ááºáá« á áá»á¯á¶áá¬ážááá·áºááá¯ááºáá¯ááºá¡á¬ážáá»ááºá áááºááŸááºá¡á¬ážáááºáá±ážáá«" +msgstr "á€ááá¯ááºáááº zip ááá¯ááº áááºáá¯á¡ááŒááº áááº áá±á¬ááºážááá¯áá¬ážáá±á¬ áá±á¬á·ááºáá²\n ááŒááºáááºá áá±á¬á·ááºáá²áá¯ááºááá¯ ááŒááºáá»ááŒá®áž áááºááŸááºááá¯ áááºáá±áž á¡áááºááŒá¯áá«á" #: lib/gettor/i18n.py:136 msgid "" @@ -208,14 +208,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr " áááºááŸááºáááºáá±ážáááº \n================\náááºáááœááºáá»á°áá¬ááœááºGnuPGááá·áºááœááºážáá¬ážááá»áŸááº gpg ááœááºáááºážááá¯ááºážá¡á¬ážá¡áá¯á¶ážááŒá¯áá«" +msgstr "áááºááŸááº áááºáá±ážáááº \n=============\ná¡áááºá áááºá·ááœááºáá»á°áá¬á GnuPG ááá¯ ááœááºážáá¬ážáá»áŸááºá zip ááá¯ááº\n ááŒááºáá»ááŒá®ážáá±á¬ááº á¡á±á¬ááºáá«á¡ááá¯ááºáž gpg ááœáŸááºááŒá¬ážáá»ááºááá¯ áá±ážáá« -\n\n gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:143 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "áá¯ááºááŒáá¬ážááá·áºáá»á¬ážááá·áº áááºáá¯á¶áááºáá¯ááŸáá·áºáá°áá®áá±áááº :\n\n gpg: 'Erinn Clark ááŸáá±á¬ááºáá¶áá»ááºáá±ážáá¬ážááá·áºáá±á¬ááºááœááºááá·áºáááºááŸááº <...>'" +msgstr "ááœááºáá±á«áºáá¬áááºá· ááŒááºááœááºážáááº á€ááá¯á· áááºáá°áááº -\n\n gpg: 'Erinn Clark áá¶ááŸ áá±á¬ááºážáá±á¬ áááºááŸááº<...>'" #: lib/gettor/i18n.py:147 msgid "" @@ -223,13 +223,13 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "áááºáááºááœááºáááºážááá¯ááºážá¡á¬ážá¡áá¯á¶ážááŒá¯ááŸá¯á·ááŸáá·áºááááºážááŸá®ážáá»áŸááº á€ áááºááá¯ááºááœááº\n áá»á®áá°á¡áá¯ááº ááŒáá·áºá¡áá¯á¶ážááŒá¯ááŸá¯á·á¡á¬áž\n ááŸá¬ááœá±ááá·áºáááº" +msgstr "á¡áááºá áááºáááº ááœááºáááºážááá¯ááºážáá»á¬ážááŸááºá· áááºážááŸá®ážááŸá¯ áááŸááá»áŸááºá á¡á±á¬ááºáá« \náá¬áá»ááºááŸá¬ááœááº GnuPG áá²á·ááá¯ááºáá±á¬ áá¯á¶ážááœá²áá° ááŒááºááœááºáž áááºáá¯ááá¯ ááŒáá¯ážáá¬áž ááŸá¬ááœá±áá« -\n\n http://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:152 msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "áá»áááºáááºááŸá¯ááá¯ááááºáá¬ážáááº/áááºáá¬ááááºáá¬ážáááº \n==========================" +msgstr "áááºáá±á¬ááºááœááºá· ááááºáá¬ážáááº / áááºáá¬ááááºáá¬ážáááº \n================================" #: lib/gettor/i18n.py:155 msgid "" @@ -239,7 +239,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "á¡áááºá áááºá á¡ááºáá¬áááºáá»áááºáááºááŸá¯áááº Tor ááœááºáááºááá¯á· áááºáá±á¬ááºááŒááºážááá¯ ááááºáááºáá¬ážáá»áŸááº áááºáááº \nBridge Relay ááá¯ ááá¯á¡ááºáááºá Bridge Relayáá»á¬ážáááº á¡ááá ááá¯ááºáááºážááŒá±á¬ááºážáá²ááœááº áá¬áááºážááŒá¯áá¯ááá¬ážááá·áº\n Tor Relayáá»á¬áž ááŒááºáááºá áááºážááá¯á·ááŸá¬ ááŒá®ážááŒáá·áºáá¯á¶ááá·áº áá¬áááºážáá»á¬áž ááá¯ááºááá·áºá¡ááœááº á¡áááºá áááºá\ná¡ááºáá¬áááºáá¬ážáááºáááºáá±á¬ááºááŸá¯áá¯áá¹ááá®áááº áá°áááá»á¬ážáá±á¬ Tor Relayáá»á¬ážá¡á¬ážáá¯á¶ážááá¯á· \n á¡ááºáá¬áááºáá»áááºáááºááŸá¯áá»á¬ážá áá¯ áááºáá«áááºáááºáá±ážáá±áá»áŸááºáááº áááºážBridge Relayáá»á¬ážáááº\n Bridge áá»á¬ážá¡á¬ážáá¯á¶ážááá¯ ááááºáááºáááº áááºááá¯ááºáááºááá¯ááºáá«á" +msgstr "á¡áááºá áááºá· á¡ááºáá¬áááºááá¯ááºážáááº Tor ááœááºáááºáá² áááºáá±á¬ááºááœááºá· \nááááºáá¬ážáá»áŸááºá Bridge Relay áááºáá¯ áááºááá¯á¡ááºáá¬ááá¯ááºáááºá Bridge Relays \n(ááá¯á·ááá¯ááº á¡ááá¯áá±á¬ááºááŒááºá· \"bridges\") áá»á¬ážáááº áááºá ááá¯ááºáááºážááŒá±á¬ááºážáá²á\náá¬áááºáž ááŒá¯áá¯ ááá¬ážáááºá· Tor Relays áá»á¬áž ááŒááºáááºá áááºážááá¯á·á áá¯á¶áá¬áááºáž\n á¡ááŒááºá·á¡áá¯á¶ áááŸááá±á¬ááŒá±á¬ááºá·á á¡áááºá áááºá· ISP áááº Tor Relay áá»á¬áž á¡á¬ážáá¯á¶áž\n áááºááœááºááŸá¯ááá¯ááºáž á¡á¬ážáá¯á¶ážááá¯ áá®áááºáá±áááºááá¯ááºá Bridge áá»á¬áž á¡á¬ážáá¯á¶ ážááá¯\n ááááºáááºááá¯ááºáááº ááá¯ááºáá«á" #: lib/gettor/i18n.py:162 msgid "" @@ -247,13 +247,13 @@ msgid "" "in the body of the email to the following email address:\n" "\n" " bridges(a)torproject.org" -msgstr " á¡á±á¬ááºááœááºááŒáá¬ážááá·áº á¡á®ážáá±ážááºááááºáá¬á áá¬ááá¯ááºá¡ááœááºážá\"get bridges\"áá«áááºáá±á¬áá±ážááºáááºáá±á¬ááºá¡á¬ážááá¯á·ááŒááºážá¡á¬ážááŒáá·áºáááºáááºááááºáá»áºáááºáá¯áááá¯ááºáá«áááºâ\n\n bridges(a)torproject.org" +msgstr "Bridge áááºáá¯ááá¯ ááá°áááº á¡á±á¬ááºáá« á¡á®ážáá±ážááºááááºáá¬á áá¬ááá¯ááºáá²ááœááº\n \"get bridges\" áááºá·ááŒá®áž á¡á®ážáá±ážááº áááºáá±á¬ááº áá±ážááá¯á·ááá¯ááºáááº -\n\n bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "á¡á±á¬ááºááœááºááŒáá¬ážááá·áº áááºáááá±á¬ááºáá¬ááŒáá·áº áá°áá¯á¶ážááá¯ááºááá·áº ááááºáá»áºáá»á¬ážááŒááºááá¯ááºááá¬áž url: https://bridges.torproject.org/" +msgstr "Bridges áá»á¬ážááá¯ ááœááºáááº ááá±á¬ááºáá¬ááŒááºá· á¡á±á¬ááºááœááº ááŒáá¬ážáá±á¬\n áááºá·ááºááœááºáááºáž ááá°ááá¯ááºáááº url: https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -262,32 +262,32 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "á¡áá°ážáááááŒá¯áááº :" +msgstr "á¡áá±ážááŒá®ážáá±á¬ ááŸááºáá»ááº -\ná€á¡áá¬áááº ââââââáá±á¬ááºážááá¯áá¬ážáá±á¬ ááá¯ááº á¡ááá¯ááºážá¡áá á¡ááááºá¡ááá¯ááºáž\n ááŒááºáá±á¬ááŒá±á¬ááºá· ááá¯ááº á¡ááá¯ááºážá¡á á¡á¬ážáá¯á¶áž áááŸááááºá·ááá¯ááºá¡á±á¬ááº áá±á¬ááºá·ááŒá®áž\n ááá¯ááºáááºáá±áá¬ áááºáá¯áá²ááœááº ááááºážáá¬ážáá¬ ááá ááá¯ááºááá¯ ááŸááºáá»ááº\n ááŸáááºááŒááºážááŒááºá· ááŒááºáá»ááá¯ááºáááºá" #: lib/gettor/i18n.py:176 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "ááá¯ááºáá¯ááºáá»á¬ážá¡áá®á¡áááºááá»áá²áá±á¬ááºáá¬áááº á ááá¯ááºáá¯ááºá¡á¬ážáá¯á¶ážá¡á¬ážáááœáá·áºáá® áááŸááá¬ážáá»á¬ážááá¯áááºáá±ážáá« á" +msgstr "ááá¯ááºáá¯ááºáá»á¬ážáááº á¡áá®á¡áááºááá» áá±á¬ááºáá¬ááá¯ááºáááºá ááá¯ááºáá»á¬ážááá¯ \náááŒááºáá»áá® ááá¯ááºáá¯ááº á¡á¬ážáá¯á¶áž ááá áááºáá±ážáá«á" #: lib/gettor/i18n.py:179 #, python-format msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." -msgstr "á€áá¬ááá¯ââá±á¡á¬ááºááŒááºááœá¬ áá¬ážáááºáá«áááº á áááºá·áâá±áá¬ááºážááá¯ááŸá¯á·á¡á¬ážáá»ááºáá»ááºážáá¯ááºáá¬ááºâá±ááááºá· á áááºáááá¯ááºáá¯ááºá¡á¬áž (%s)á¡á¬ážáááááºá¡áááºážá¡ááœááºážááá¯á·áá±ážáá«á·áááº á" +msgstr "á€á¡áá»ááºááá¯ á¡á±á¬ááºááŒááºááœá¬ áá¬ážáááºáá«ááŒá®á áááºá· áá±á¬ááºááá¯áá»ááºááá¯ áá±á¬áá±á¬áááº\n áá±á¬ááºááœááºáá±áááºá áááºá·ááá¯ááºáá¯ááº (%s) áááº áá±á¬ááºáááº áááºáááááº á¡ááœááºáž áá±á¬ááºááŸááá¬áááºá" #: lib/gettor/i18n.py:182 msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." -msgstr "ááá¯ááºáá¯ááºáá»á¬ážááá·áº ááá·áºáá¡á®ážáá±ážááºáá±á¬ááºáá¶áá±ážáá°á¡ááœááº ááŒá®ážáá¬ážáá±áá« ááá¬áž áGMAIL.COM, YAHOO.CN or YAHOO.COM áááá·áºá¡á®ážáá±ážááºá¡áá±á¬áá·áºáá»á¬ážááŸááŒááºáááºááá¯á·áááºááŒáá¯ážáá¬ážáá«á" +msgstr "á¡áááºá ááá±á¬ááºáá²á·áá«áá á€ááá¯ááºáá¯ááºáááº áááºá·áá±ážááº áá¶á·ááá¯ážáá°á¡ááœááº ááŒá®ážááœááºážáá±á\n ááŒááºáááºá GMAIL.COM, YAHOO.CN (ááá¯á·) YAHOO.COM á¡áá±á¬ááºá·ááŸ áá±ážááº ááŒáá¯ážáá¬ážááŒá®áž ááá¯á·áá«á" #: lib/gettor/i18n.py:185 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "áá¶ááá±á¬ááºážááœá¬ááŒáá·áº áá»áœááºáá±á¬áºááá¯á·áááœá±á·ááŒá¯á¶áá°ážááá·áºááŒááá¬á¡á¬ážááŒá±ááŸááºážáá±ááá·áºá¡ááœááº áááºááá±á¬ááºážááá¯ááŸá¯á·á¡á¬ážááá±ážááá¯á·ááá¯ááºáá« ááá»áœááºáá±á¬áºá€ááŒá¿áá¬á¡á¬áž ááŒá±ááŸááºážáááºááŒáá¯ážáá¬ážáá«á·áááº á" +msgstr "áá¶ááá±á¬ááºážááœá¬ááŒááºá· áá»áœááºá¯ááºááá¯á·áááº áá±á¬áá±á¬áááº ááŒá¿áá¬áá»á¬áž áááºááá¯ááºáá±áá\n áááºá·áá±á¬ááºážááá¯áá»ááºááá¯ ááá¯ áááŒá±ááŸááºážáá±ážááá¯ááºáá«á á€ááŒá¿áá¬ááá¯\n áá»áœááºáá±á¬áºááá¯á· ááŒáá¯ážáá¬áž ááŒá±ááŸááºážáá±áááº áááºážáá¶áá±ážáá«á" #: lib/gettor/i18n.py:188 msgid "" @@ -295,13 +295,13 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "áá¶ááá±á¬ááºážááœá¬ááŒáá·áºááá·áºáá±á¬ááºááá¯áá¬ážááá·áº áááœá²áá¬ážááá·áºááá¯ááºáá¯ááºáááŸááá« á\nááá¯á·á¡ááœááºá¡ááŒá¬ážááá¯ááºáá¯ááºáá¬áááº ááá¯á· áá°áá®ááá·áºááá¯ááºáá¯ááºá¡á¬áž ááá¯á·áá±áá«ááá¯ááá¯á·ááá¯á·áá¬ááœááº 'split'á¡á¬ážáááºáááá¯á·áá« á \n á€áááá¹ááá»áá¯ážááœáá·áº ááá¯ááºáá¯ááºááŒá®ážáááºáá¯áá¯á¶ážá¡á¬ážááá¯á·áá±á·ááŸáááá·áºá¡ááœááº áááºááá¯áá»ááºááá·áº á¡áá¬ááá¯áá±áá»á¬ááœá¬áá±á¬ááºážááá¯áááº á" +msgstr "áá¶ááá±á¬ááºážááœá¬ááŒááºá· áááº áá±á¬ááºážááá¯áá¬ážáááºá· ááá¯ááºáá¯ááºá¡ááœááº ááá¯ááºá¡ááá¯ááºážá¡á áááŸááá«á\n á¡ááŒá¬áž ááá¯ááºáá¯ááº á¡áááºááá¯ áá»áœááºáá±á¬áºááá¯á·áá¶ áá±ážááá¯á·áá« (ááá¯á·) á¡áá¬ážáá° ááá¯ááºáá¯ááºááá¯ áá±ážááá¯á·áá«á \nááá¯á·âáá¬ááœááº 'split' áá±á¬á·áá»ááºáá¬áá¯á¶ážááá¯ áááºááŸá¬ážáá«á á¡á²áá®á¡ááœááº ááá¯ááºáá¯ááº áááºáá¯áá¯á¶ážááá¯ \náááºá·áá¶ áá±ážááá¯á·áá±ážáááº ááŒááºáááºá á€á¡áá¬áááº áááº ááá¯á¡ááºáá±á¬ á¡áá¬ áá¯ááºááá¯ááº áááºáá±ážáá«á" #: lib/gettor/i18n.py:193 msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "ááá¯ááºáá»á¬ážá¡á¬ážááŒááºáá±áááº\n===================" +msgstr "ááá¯ááºáá»á¬ážááá¯ ááŒááºáá»áá±áááº\n================" #: lib/gettor/i18n.py:196 msgid "" @@ -310,13 +310,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "áááºáááºáá¶áááŸááá¬ážááá·áºááá¯ááºáá¯ááº á¡á¬ážááŒááºááŒááºáááºá¡ááœááºá¡ááœááºáá¯á¶ážáááºážááŸá¬7-Zip \n(ááá¯ááºáá»á¯á¶á·ááŒááºáž/ ááá¯ááºááŒáá·áºááŒááºážáááááá¬ )á¡á¬ážááá·áºááœááºážá¡áá¯á¶ážááŒá¯ááŒááºážááŒááºáá«áááº á\náááºáááœááºáá»á°áá¬ááœááº áááá·áºáá¬ážáá±áá«á á¡á±á¬ááºáá±á¬áºááŒáá«áá±áá¬ááœááºááœá²áá»ááá¯ááºáá«áááº á\n\nhttp://www.7-zip.org/" +msgstr "áááº áááŸááá±á¬ ááá¯ááºáá»á¬áž ááŒááºáá»áááº á¡ááœááºáá°áá¯á¶áž áááºážáááºážááŸá¬ á¡ááá²á· ááá¯ááºáá»á¯á¶á·/ááá¯ááºááŒááº\n áááááá¬ ááŒááºáááºá· 7-Zip ááá¯ áááºáá² áááºá·ááœááºážáááº ááŒááºáááºá á¡áááºá áááºážááá¯\n áááºá· ááœááºáá»á°áá¬áá²ááœááº áááœááºážáá±ážáá«áá á¡á±á¬ááºáá« áá±áá¬ááŸ áááº áá±á«ááºážáá¯ááº ááœá²ááá¯ááºáááºá\n\n http://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "7-Zip á¡á¬ážááá·áºááœááºážáá¬ážáá»áŸááº áááºááŸááá¬ážááá·áº .z ááá¯ááºáá¯ááºá¡á¬áž\nááá¯ááºááŸááºáá»ááºáááºááá¯ááºááŸáááºááŒááºážááŒáá·áºááœáá·áºááá¯ááºáá«ááŒá® á" +msgstr "7-Zip ááá¯ áááºáá² áááºá·ááœááºážáááºá·á¡áá«á áá»áœááºá¯ááºááá¯á·áá¶ááŸ áááº áááŸááá±á¬\n .z ááá¯ááºáá¯ááºááá¯ ááŸááºáá»ááº ááŸáááºááŒá®áž ááœááºá·ááá¯ááºáááºá" #: lib/gettor/i18n.py:205 msgid "" @@ -324,13 +324,13 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr ".z ááá¯ááºá¡á¬ážááŒááºáá»áááºá¡ááŒá¬ážáááºážáááºážááŸá¬ááá¯ááºáá±á¬ááºáááºááœá²áá¡áááºá¡á¬áž .zip ááá¯á·ááŒá±á¬ááºážáá« \n áá¥ááá¬á¡á¬ážááŒáá·áº áááºáááº \"windows.z\"ááá¯ááºá¡á¬ážáááºáá¶áááŸááá»áŸááº \ná¡ááá¯áá«ááá¯ááºá¡á¬áž\"windows.zip\" ááá¯á·á¡áááºááŒá±á¬ááºážáá« áááŒá®ážáá»áŸááºáááºáááºáá¯á¶ááŸááºá¡ááá¯ááºážááá¯ááºáá¯ááºá¡á¬ážááŒááºáá¡áá¯á¶ážááŒá¯ááá¯ááºáá«ááŒá® á" +msgstr ".z ááá¯ááºáá»á¬ážááá¯ áááŸáááá¯ááºáá±á¬ áááŒá¬áž áááºážáááºážááŸá¬ áááºážááá¯á·ááá¯ .zip á¡ááŒááº á¡áááºááŒá±á¬ááºážáááº\n ááŒááºáááºá á¥ááá¬á¡á¬ážááŒááºá·á \"windows.z\" áá±á«áº ááá¯ááºáááºáá¯ááºááá¯ áááº áááŸááá»áŸááºá áááºážááá¯\n \"windows.zip\" á¡ááŒááº ááŒá±á¬ááºážáá«á á€áááºážááŒááºá· ááá¯ááºáá¯ááºááá¯ áááºá· ááœááºáá»á°áá¬áá²ááœááº\n ááœááºážáá¬ážááŒá®ážááŒááºáá±á¬ ááá¯ážááá¯áž ááá¯ááºáá¯ááº áááá¯ááááºáá»á¬ážááŒááºá· áááº ááŒááºáá»ááá¯ááºáááºá ááŒá®ážáá»áŸááº\náááºáááºáá¯á¶ááŸááºá¡ááá¯ááºážááá¯ááºáá¯ááºá¡á¬ážááŒááºá á¡áá¯á¶ážááŒá¯ááá¯ááºáá«ááŒá® á" #: lib/gettor/i18n.py:210 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" -msgstr "á€áá±ážááºá¡á¬áž áá¬ááŒááºááŒá®áž áááºá áá¬áá²áááºáá±áá¬áá¬á áá±á¬á·áá²á¡ááœá²ááá¯ááºá¡áááºáááºáá¯áááºážááá¯ áá»áœááºáá±á¬á·áºá¡á¬áž áá»á±ážáá°ážááŒá¯á ááŒá±á¬áá«á á€áá±á¬á·áá²á¡ááœá²ááá¯ááºááŸá¬ áá¬áá²ááá¯áááºááá¯ áá¬ááá¯ááá¯ááŒáá·áº ááŸááºážááŒáá¬ážáá»ááºáááº áá®áá±áá¬ááœááº ááŸááááºá â" +msgstr "á€áá±ážááºááá¯ áá¬ááŒááºááŒá®ážá áááºá· ááŒááºáá¬ áááºáá±áá¬áá¬á áá±á¬á·ááºáá²áá¯ááº á¡áááº\n áááºáá¯ááá¯ áá±á«áºááŒáá«á á€áá±á¬á·ááºáá²áá¯ááº âá¡ááŒá±á¬ááºáž ááŸááºážáááºážáá»ááº á¡áá»ááºážááá¯\n á€áá±áá¬ááœááº áá±á«áºááŒáá¬ážáááº â" #: lib/gettor/i18n.py:213 msgid "" @@ -338,59 +338,59 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "windows:\nThe Tor ááá±á¬ááºáá¬ááá¯ Windows áá¯ááºáá±á¬ááºááŸá¯á·ááááºááœááºá¡áá¯á¶ážááŒá¯ááá¯ááºáá«ááá·áºáá€ááá¯ááºáá¯ááºááá·áº Windows XP, Windows Vista or \nWindows 7 ááá¯á·ááœááº á¡áá¯á¶ážááŒá¯ááá¯ááºáá«áááº á" +msgstr "windows:\nWindows os á¡ááœááº Tor Browser Bundle ááá¯ááºáá¯ááº ááŒááºáááºá á¡áááºá áááºáááº\n Windows XP, Windows Vista or \nWindows 7 áá²á·ááá¯á· Windows áá¬ážááŸááºáž ááá»áá¯á·ááá¯\n áá¯á¶ážááœá²áá±áá«áá á€ááá¯ááºáá¯ááºáá»á¬ážáááº áááº áá¯á¶ážááœá²ááááºá· á¡áá¬ ááŒááºáááºá" #: lib/gettor/i18n.py:218 msgid "" "macos-i386:\n" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." -msgstr "macos-i386:\nOS X, Intel CPU architectureá¡ááœááº Tor ááá±á¬ááºáá¬Bundleááá¯ááºáá¯ááº ááá¯á¶ááŸááºá¡á¬ážááŒáá·áº\n á€ááá¯ááºáá¯ááºá¡á¬ážá¡áá¯á¶ážááŒá¯áááºá¡áááºááŒááºáá±á¬ Mac hardware ááá¯á¡ááºáááºá" +msgstr "macos-i386:\nOS X, Intel CPU architecture á¡ááœááº Tor Browser Bundle ááá¯ááºáá¯ááº ááŒááºáááºá \náá¯á¶ááŸááºá¡á¬ážááŒááºá·á \n ááá¯áááºááœááºáá±á¬ Mac hardware áááº á€ááá¯ááºáá¯ááºááá¯ ááá¯á¡ááºáá¬ááááºáááºá" #: lib/gettor/i18n.py:222 msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "macos-ppc:" +msgstr "macos-ppc:\ná€áá±á¬á·ááºáá²áááº PowerPC CPUs áá¯á¶ážâáá¬ážáá±á¬ OS X ááœááº á¡áá¯á¶ážááŒá¯áá±á¬\n Macs á¡áá±á¬ááºážá¡ááœááº á¡ááºáááá¯áá¬ á¡áá±á¬ááºáž (\"Vidalia bundle\") ááŒááºáááºá\n á€ááá¯ááºáá¯ááºáááº áááŒá¬áá® áááºáááºážáá¯ááºáá±á¬á·áááº ááŒááºáááºá" #: lib/gettor/i18n.py:226 msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." -msgstr "linux-i386:\n Tor áâáá±á¬ááºáá¬á¡á¬áž áááºážáááº 32bit ááááºááœááº á¡áá¯á¶ážááŒá¯ááá¯ááºááá·áºááá¯ááºáá¯ááº" +msgstr "linux-i386:\n Linux, 32bit áá¬ážááŸááºážá¡ááœááº Tor Browser Bundle ááá¯ááºáá¯ááºá" #: lib/gettor/i18n.py:229 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "á€ááá¯ááºáá¯ááºáááº 30 MBáááºáá»á¬ážáá±á¬ááŒá±á¬áá·áº áááºáá¡á®ážáá±ážááºáááº á€ááá¯ááºááá¯ááºááá¯ áááºáá¶ááá¯ááºáá«ááá¬áž á" +msgstr "á€ááá¯ááºáá¯ááºáááº á¡ááœááºááŒá®ážááŒá®áž áááºá· á¡á®ážáá±ážááº áá¶á·ááá¯ážáá°áááº \n30 MB á¡ááœááº áá°ážááœá²ááá¯ááºáá»á¬áž áá±ážááá¯á·ááœááºá·ááŒá¯áááº ááá¯á¡ááºáááºá" #: lib/gettor/i18n.py:232 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." -msgstr "linux-x86_64:\n Tor áâáá±á¬ááºáá¬á¡á¬áž áááºážáááº 64bit ááááºááœááº á¡áá¯á¶ážááŒá¯ááá¯ááºááá·áºááá¯ááºáá¯ááº" +msgstr "linux-x86_64:\n Linux, 64bit áá¬ážááŸááºážá¡ááœááº Tor Browser Bundle ááá¯ááºáá¯ááº ááŒááºáááºá" #: lib/gettor/i18n.py:235 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." -msgstr "source:\n The Tor ááá°áá¡ááŒá±áá¶áá¯ááºáá»á¬áž, ááá¬ááŸááºáá»á¬ážá¡ááœááºáá¬ á á¡áá¯á¶ážááŒá¯áá°á¡áá»á¬ážáá¯á¡ááœááº á€ááá¯ááºáá¯ááºáá»á¬ážáááá¯á¡ááºáá± á" +msgstr "á¡áááºážá¡ááŒááº -\n áá»áœááºážáá»ááº ááá¬ááŸááºáá»á¬ážá¡ááœááº Tor á¡áááºážá¡ááŒááº áá¯ááºá á€áá±á¬á·ááºáá²áá¯ááºááá¯ áá¯á¶ážááœá²áá° á¡áá»á¬ážáá¯á áááá¯á¡ááºáá«á" #: lib/gettor/i18n.py:238 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "áááŒá¬áááá±ážáá±á·ááŸááááºáá±ážááœááºážáá»á¬áž\n==========================" +msgstr "áá±ážáá±á·áá±ážá áá±ážááœááºážáá»á¬áž\n=================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "Torááá¯áááºááŸá¬ ?" +msgstr "Tor ááá¯áááºááŸá¬ á¡áááºáááºáž?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr " \"Tor\" á¡áááºáááºá¡áá»áá¯ážáá»áá¯ážáá±á¬ áá±á«ááºážáááºáá¬ážááá·áºá¡áá¬áá»á¬ážááŒáá·áºááœááºážááá¯ááá¯ááºáá«áááº á" +msgstr "\"Tor\" á¡áááºáááº á¡ááááºá¡ááá¯ááºáž á¡áá»áá¯ážáá»áá¯ážááá¯ áááºááœáŸááºážáááºá" #: lib/gettor/i18n.py:245 msgid "" @@ -403,22 +403,22 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "Tor áá±á¬á·ááºáá²áááº áááºáááœááºáá»á°áá¬ááœááºá¡áá¯ááºáá¯ááºááá¯ááºáááºáááá¯ááááºáááºáá¯ááŒááºáááº Tor áááº ááá·áºá¡á¬ážá¡ááºáá¬áááºá¡á¬ážá¡áá¯á¶ážááŒá¯áá¬ááœááºáá¯á¶ááŒá¯á¶ááááºáá»áá±áááº á \n Tor áááºááá·áºá¡á¬ážá¡ááá¹áá¬á¡áááºáááº ááŸáááá¯ááºáá¬ ááá¯ážááŸááºááá¯ááºááá¯ááºááŸá¯á·áá»á¬áž á\n ááá·áºáá¡ááºáá¬áááºá¡áá¯á¶ážááŒá¯ááŸá¯á·á¡á¬ážáá±á¬áá·áºááŒáá·áºáá±ááŒááºáž áááá·áºáááºááá·áºáá±áá¬ááœááº á¡ááºáá¬áááºá¡áá¯á¶ážááŒá¯áá±ááŒááºážáá»á¬áž áááá·áºá¡áá¬áá»á¬ážá¡á¬ážáá¬ááœááºáá±ážáá¬ážááá·áº á\náá°áá®áá±ážááá·áºá á®áá±ážá¡áá¯á¡á¬áž Tor ááœááºáááºáá¯áá±á«áºááá·áº á\n Tor ááœááºáááºááŸáá·áºáááºáááºá á¡áá±ážááááºáá»á¬ážááá¯ https://www.torproject.org/about/overview.html.en ááœááºáááºááŸá¯á·ááá¯ááºáá«áááº á" +msgstr "á€ Tor áá±á¬á·ááºáá²áááº áááºá· ááœááºáá»á°áá¬ááœááº áá¯á¶ážááœá²ááá¯ááºáá±á¬ áááá¯ááááº áááºáá¯ááŒááºááŒá®ážá\n á¡ááºáá¬áááºááá¯ áá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ áá¯á¶ážááœá²áá±áááºá Tor áááº áááºá· áááºááœááºáá±áž áááºážááŒá±á¬ááºážáá»á¬ážááá¯\n ááá¹áá¬áááŸááºážááŸ áá±ááá¬á· áááºáááºážáá»á¬ážá áá¯á¶ážááœá²áá±á¬ ááŒááºá·áá»ááºáá¬ážáá±á¬ relays ááŒááºá·\n áááºá·ááá¯ áá¬ááœááºáá±ážáááºá áááºážáááº ááá¯á¶ááá±á¬ááºá á¡ááºáá¬áááºááŸ áááº ááŒááºá·ááŸá¯áá±áá±á¬\n ááœááºáááº áá¬áá»ááºááŸá¬áá»á¬ážááá¯ áááááá¯ááºáá±áááº áá¬ážáá®ážáá±ážá áŒá®ážá áááº ááŒááºá·ááŸá¯áá±á¬ ááœááºáááº\n áá¬áá»ááºááŸá¬áá»á¬ážá áááº áááºááŸááá±á¬ áá±áá¬ááá¯ ááááá±áááº áá¬ážáá®ážáá±ážáááºá\n á€ááá¯á·áá±á¬\n áá±ááá¬á· relays á¡áá¯ááá¯ Tor ááœááºáááº áá¯áá±á«áºáááºá\n Tor á¡áá¯ááºáá¯ááºáá¯á¶ á¡áá±ážááááºáá»á¬ážááá¯\n https://www.torproject.org/about/overview.html.en\n ááœááº áááºááŸá¯á·ááá¯ááºáááºá" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "Tor Browser Bundle ááá¯áááºááŸá¬á¡áááºáááºážá" +msgstr "Tor Browser Bundle ááá¯áááºááŸá¬ á¡áááºáááºážá" #: lib/gettor/i18n.py:257 msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "ááá±á¬áá·áºáá¬áá±á¬á·áá²á¡ááœá²ááá¯ááº(TBB)áááº á¡áá¯á¶ážááŒá¯áá°á¡áá»á¬ážáá¯á¡á¬áž á¡ááŒá¶áá±ážááá¯ááºááœááºážáá¬ážááá·áº áá±á¬á·áá²á¡ááœá²ááá¯ááºááŒááºáááºá\náááºážáá±á¬á·áá²á¡ááœá²ááá¯ááºáááºá¡ááºáá¬áááºááá¯ ááááºáá»ááœá¬ ááŒáá·áºááŸá¯áááºááá¯á¡ááºááá·áº á¡áá¬áá»á¬áž áá«áááºá\náááºážááá¯ ááŒááºá ááœáá·áºááá¯ááºáá¯á¶áá¬ááŒááºáááºá" +msgstr "Browser Bundle (TBB) áááº áá¯á¶ážááœá²áá° á¡áá»á¬ážáá¯á áá¯á¶ážááœá²áááºá·áááºá· áá±á¬á·ááºáá²áá¯ááº\n ááŒááºáááºá áááºážáá±á¬á·áá²áá¯ááºáááº á¡ááºáá¬áááºááá¯ áá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ áá¯á¶ážááœá²ááá¯ááºáááº ááá¯á¡ááºáá±á¬\n á¡áá¬ááŸááºááá»áŸ áá«áááºáááºá áááºážááá¯ ááŒááºáá»ááŒá®áž ááœááºá·áááºáá¬ ááŒááºáááºá" #: lib/gettor/i18n.py:261 msgid "What package should I request?" -msgstr "áááºááá¯áááºáá±á·áá»áá¯ážááá¯áá±á¬ááºážááá¯ááá·áºááááºážá" +msgstr "áááºááá¯ áá±á¬áºá·ááºáá²áá¯ááºáá»áá¯ážááá¯ áá±á¬ááºážááá¯áááºá·ááááºážá" #: lib/gettor/i18n.py:263 msgid "" @@ -426,19 +426,19 @@ msgid "" "operating system is Microsoft Windows, you should request \"windows\". Here\n" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" -msgstr "áááºá¡áá¯á¶ážááŒá¯ááá·áºá¡áá¬áááº ááá·áºááœááºáá»á°áá¬ááá¯ááºáá±á¬ááºááŸá¯ááááºáá±á«áºááœááºááŸá®ááá¯áá±áá«áááº á á¥ááá¬á¡á¬ážááŒáá·áº ááá·áºááá¯ááºáá±á¬ááºááŸá¯ááááºááá·áº Microsoft Windows ááŒááºáá»áŸááº áááºááá·áº \"windows\" áá±á¬ááºážááá¯ááá·áºááá·áº á á€áá±áá¬ááœááº \nááá¯ááºáá¯ááºá¡á¬ážáá¯á¶ážá¡ááœááº áá±á¬ááºážááá¯áááº ááá·áºááá·áºáá¯ááºáá±á¬ááºááŸá¯á·ááááº\náááá¯ á¡áá»ááºážáá»á¯ááºááŸááºážááŒáá±ážáá¬ážáááº á" +msgstr "áááºážáááº áááº á¡áá¯á¶ážááŒá¯áá±á¬ os áá±á«áºááœááº áá°áááºáááºá á¥ááá¬ á¡á¬ážááŒááºá·á á¡áááºá\n áááºá· os áááº Microsoft Windows ááŒááºáá«áá \"windows\" áá¯ áá±á¬ááºážááá¯ááá¯ááºáááºá\n á€áá±áá¬áááº áááº áá±á¬ááºážááá¯áááºá· áá±á¬á·ááºáá²áá¯ááº á¡á¬ážáá¯á¶ážááŸááºá· áááºá·áá»áŸá±á¬áºáááºá·\n os á¡ááœááº ááŸááºážáááºážáá»ááº á¡áá»ááºáž ááŒááºáááº -" #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?" -msgstr "áááºááá¯á·áá±ážááá·áº ááá¯ááºááá¯ áá»áœááºáá±á¬áºáááºááá¯ááŒááºááááºáááºážá" +msgstr "áááºááá¯á·áá±ážáá±á¬ ááá¯ááºááá¯ áá»áœááºáá±á¬áº áááºáá²á·ááá¯á· ááŒááºáá»áááºáááºáž?" #: lib/gettor/i18n.py:270 msgid "QUESTION:" -msgstr "áá±ážááœááºáž :" +msgstr "áá±ážááœááºáž -" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "á¡ááŒá±:" +msgstr "á¡ááŒá± -" #: lib/gettor/i18n.py:274 #, python-format @@ -450,4 +450,4 @@ msgid "" " https://www.oignon.net/dist/torbrowser/\n" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" -msgstr "áááºáá±á¬ááºážááá¯ááá·áº ááá¯ááºáá¯ááºáá»á¬ážáááº(%s) á¡á®ážáá±ážááºááŸ ááá·áºááœáá·áºááŒá¯áá¬ážáááºáááº/náá»á±á¬áºááœááºáá±áááŒáá·áº áááºááá¶ááá¯ááºáá±á¬ááŒá±á¬áá·áº á¡ááŒá¬áž á¡á®ážáá±ážááºáááºáá±á¬áá·áºááŸá¯á·ááŒáá·áº á¡áá¯á¶ážááŒá¯ááá·áºáá«áááº ááá«ááŸááá¯ááº á¡á±á¬ááºáá«áá±áá¬áá»á¬ážááœááºáááºáž ááœá¬ážáá±á¬ááºá ááœá²áá»ááŒá®áž á¡áá¯á¶ážááŒá¯ááá¯ááºáá«áááº á\nhttps://www.oignon.net/dist/torbrowser/\n https://tor.beme-it.de/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "áááºážáááºážáá«áááºá áááº áá±á¬ááºážááá¯áá±á¬ ááá¯ááºáá¯ááº (%s) áááº áááºá· á¡á®ážáá±ážááº áá¶á·ááá¯ážáá°á\n áá°ážááœá²ááá¯ááº á¡ááŒááº áááºááŸááº ááŒá®ážááœááºážáá±áááºá áá°ážááœá²ááá¯ááº á¡ááŒá®ážááá¯ áá±ážááá¯á·ááœááºá· ááŸááá±á¬ á¡ááŒá¬áž\n á¡á®ážáá±ážááº áá¶á·ááá¯ážáá°áá»á¬ážááá¯ ááŒáá¯ážáá¬ážááŒááºá·áá«á ááá¯á·ááá¯ááº á¡á±á¬ááºáá« mirrors áá»á¬ážáá²ááŸ\n áááºáá¯áá¯ááá¯ ááŒáá¯ážáá¬ážááŒááºá·áá«á\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.beme-it.de/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[torspec/master] neena got (reasonably) confused by context-sensitive config options
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit 22959c4230a53a1f3b22418fc8b46c0abd40ad7a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 03:46:32 2012 -0400 neena got (reasonably) confused by context-sensitive config options --- control-spec.txt | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 7e7e37e..40c88e8 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -223,12 +223,14 @@ "513 syntax error in configuration values" reply on syntax error, or a "553 impossible configuration setting" reply on a semantic error. - When a configuration option takes multiple values, or when multiple - configuration keys form a context-sensitive group (see GETCONF below), then - setting _any_ of the options in a SETCONF command is taken to reset all of - the others. For example, if two ORBindAddress values are configured, and a - SETCONF command arrives containing a single ORBindAddress value, the new - command's value replaces the two old values. + Some configuration options (e.g. "Bridge") take multiple values. Also, + some configuration keys (e.g. for hidden services and for entry + guard lists) form a context-sensitive group where order matters (see + GETCONF below). In these cases, setting _any_ of the options in a + SETCONF command is taken to reset all of the others. For example, + if two ORBindAddress values are configured, and a SETCONF command + arrives containing a single ORBindAddress value, the new command's + value replaces the two old values. Sometimes it is not possible to change configuration options solely by issuing a series of SETCONF commands, because the value of one of the

1 0

[tor/master] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 0600e8cab17d2128d663b31d93b93ddc1ab95ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 11:48:03 2012 -0400 Disable warning for marked-but-reading in main.c It turns out this can happen. Even though there is no reason for connections to be marked but reading, we leave them reading anyway, so warning here is unwarranted. Let's turn that back on once we do something sensible and disable reading when we mark. Bugfix for 6203 on Tor 0.2.3.17-beta. Thanks to cypherpunks for pointing out the general stupidity of the original code here. --- changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6203 b/changes/bug6203 new file mode 100644 index 0000000..bf96753 --- /dev/null +++ b/changes/bug6203 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. + diff --git a/src/or/main.c b/src/or/main.c index f8740d7..1f3117b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -848,7 +848,10 @@ conn_close_if_marked(int i) "Holding conn (fd %d) open for more flushing.", (int)conn->s)); conn->timestamp_lastwritten = now; /* reset so we can flush more */ - } else if (sz == 0) { /* retval is also 0 */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + /* Connection must flush before closing, but it's being rate-limited. * Let's remove from Libevent, and mark it as blocked on bandwidth * so it will be re-added on next token bucket refill. Prevents @@ -860,6 +863,13 @@ conn_close_if_marked(int i) connection_stop_writing(conn); } if (connection_is_reading(conn)) { + /* XXXX024 We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ +#if 0 #define MARKED_READING_RATE 180 static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); char *m; @@ -870,6 +880,7 @@ conn_close_if_marked(int i) conn_state_to_string(conn->type, conn->state), m); tor_free(m); } +#endif conn->read_blocked_on_bw = 1; connection_stop_reading(conn); }

1 0

[tor/master] Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a9de982c343b0d83078d8e46b1a06e483c8595ec Merge: 4a7e412 0600e8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:33:14 2012 -0400 Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3 changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a regression bug in AllowDotExit
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit c239c57d3c9a8ddff7db6ed20e836844b17efdae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 19:45:28 2012 -0400 Fix a regression bug in AllowDotExit The code that detected the source of a remapped address checked that an address mapping's source was a given rewrite rule if addr_orig had no .exit, and addr did have a .exit after processing that rule. But addr_orig was formatted for logging: it was not the original address at all, but rather was the address escaped for logging and possibly replaced with "[scrubbed]". This new logic will correctly set ADDRMAPSRC_NONE in the case when the address starts life as a .exit address, so that AllowDotExit can work again. Fixes bug 6211; bugfix on 0.2.3.17-beta --- changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug6211 b/changes/bug6211 new file mode 100644 index 0000000..2c8d9b8 --- /dev/null +++ b/changes/bug6211 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 210c2e0..9892078 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1100,8 +1100,8 @@ addressmap_match_superdomains(char *address) * address starts out as a non-exit address, and we remap it to an .exit * address at any point, then set *<b>exit_source_out</b> to the * address_entry_source_t of the first such rule. Set *<b>exit_source_out</b> - * to ADDRMAPSRC_NONE if there is no such rewrite. - * + * to ADDRMAPSRC_NONE if there is no such rewrite, or if the original address + * was a .exit. */ int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, @@ -1111,10 +1111,12 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, int rewrites; time_t expires = TIME_MAX; addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE; + char *addr_orig = tor_strdup(address); + char *log_addr_orig = NULL; for (rewrites = 0; rewrites < 16; rewrites++) { int exact_match = 0; - char *addr_orig = tor_strdup(escaped_safe_str_client(address)); + log_addr_orig = tor_strdup(escaped_safe_str_client(address)); ent = strmap_get(addressmap, address); @@ -1125,7 +1127,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, !strcasecmp(address, ent->new_address)) { /* This is a rule like *.example.com example.com, and we just got * "example.com" */ - tor_free(addr_orig); goto done; } @@ -1133,7 +1134,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } if (!ent || !ent->new_address) { - tor_free(addr_orig); goto done; } @@ -1151,10 +1151,11 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } log_info(LD_APP, "Addressmap: rewriting %s to %s", - addr_orig, escaped_safe_str_client(address)); + log_addr_orig, escaped_safe_str_client(address)); if (ent->expires > 1 && ent->expires < expires) expires = ent->expires; - tor_free(addr_orig); + + tor_free(log_addr_orig); } log_warn(LD_CONFIG, "Loop detected: we've rewritten %s 16 times! Using it as-is.", @@ -1162,6 +1163,8 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, /* it's fine to rewrite a rewrite, but don't loop forever */ done: + tor_free(addr_orig); + tor_free(log_addr_orig); if (exit_source_out) *exit_source_out = exit_source; if (expires_out)

1 0

[tor/master] Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit ebda15e4b5fe4d2e154526befcc6b9ad8f635813 Merge: a9de982 c239c57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:38:59 2012 -0400 Merge remote-tracking branch 'public/bug6211' into maint-0.2.3 changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 7761c1d6ac639580b686dac4b5d0607060b8c8f6 Merge: a08bbef ebda15e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:41:12 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6203 | 5 +++++ changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- src/or/main.c | 13 ++++++++++++- 4 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.3] Fix a regression bug in AllowDotExit
by nickm＠torproject.org 23 Jun '12

23 Jun '12

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

1 0

[tor/maint-0.2.3] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 23 Jun '12

23 Jun '12

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012