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

[bridgedb/develop] Update translation: fa
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 7099c46a023ccd51de5ccebec111b988153165d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:36:38 2014 +0000 Update translation: fa * THANKS TO Mohammad Hossein. --- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 373 ++++++++++++++++++++++---- 1 file changed, 317 insertions(+), 56 deletions(-) diff --git a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po index 31e7a1c..3c1c2fc 100644 --- a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po @@ -1,18 +1,22 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # arashaalaei <aalaeiarash(a)gmail.com>, 2011 -# Ardeshir, 2013 +# signal89 <ali.faraji90(a)gmail.com>, 2014 +# ardeshir, 2013 +# Gilberto, 2014 +# Mohammad Hossein <desmati(a)gmail.com>, 2014 # perspolis <rezarms(a)yahoo.com>, 2011 +# Setareh <setareh.salehee(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-05-01 00:10+0000\n" -"Last-Translator: Ardeshir\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-25 05:10+0000\n" +"Last-Translator: Mohammad Hossein <desmati(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +25,339 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "پل‌ها چه هستند؟" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[این یک پیام خودکار می باشد، لطفا پاسخ ندهید.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "فهرست پل‌های شما:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "شما از حد مجاز تجاوز نموده اید. لطفاً اندکی کند تر ایمیل بفرستید. حداقل زمان ممکن مابین\nارسال ایمیل ها %s ساعت است. تمامی ایمیل های بعدی در این مدت زمانی ارسال نخواهند شد." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "دستورات: (ترکیب دستورات برای مشخص کردن گزینه های متعدد به طور همزمان)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "به BridgeDB خوش آمدید!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "انواع ممکن از TYPE های انتقال:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "سلام، %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "سلام دوست من!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Public Key ها" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "این ایمیل با رنگین کمان ها، اسب های تکشاخ و زرق و برق برای %s بر %s و در %s تولید شده است." -#: lib/bridgedb/templates/base.html:34 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s پل‌ها %s بازپخش کننده‌هایی هستند که به شما برای دور زدن سانسور کمک میکنند" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB می تواند پل ها با %sانواع متعددی از Pluggable Transports%s فراهم کند که کمک می کنند اتصال شما به Tor Network تا حد امکان مبهم و ناشناس باقی بماند و هیچ کس دیگری نتواند به راحتی به اتصال شما به اینترنت نظارت کند و تشخیص بدهد که شما از Tor استفاده می کنید.\n" -#: lib/bridgedb/templates/base.html:39 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "بعضی از پل‌ها با آدرس‌های IPv6 در دسترس هستند، هر چند برخی از Pluggable\nحمل و نقل‌ها با IPv6 سازگار نیستند.\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابتدایی و قدیمی است که %s Pluggable Transports ندارند %s و ممکن است بی مصرف به نظر برسند اما همچنان ممکن است در موارد متعددی جهت دور زدن فیلترینگ به شما کمک کنند.\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "bridge ها چه هستند؟" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s پل ها %s هستند بازپخش کننده تور که کمک می کنند به شما برای دور زدن سانسور." + +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "به یک راه دیگر برای دریافت پل‌ها احتیاج دارم!" +msgstr "به یک راه دیگر برای دریافت bridge ها احتیاج دارم!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "یک راه دیگر برای دریافت پل‌های عمومی، فرستادن یک ایمیل (از آدرس‌های %s و یا %s) به %s و قرار دادن عبارت 'get bridges' در متن ایمیل است." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s یا %s" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "به کمک احتیاج دارم! پل‌های من کار نمیکنند!" +msgstr "به کمک احتیاج دارم! bridge های من کار نمی‌کنند!" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "اگر تور شما کار نمی کند, شما باید ایمیل کنید %s." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "سعی کنید تا می توانید اطلاعات بیشتری را فراهم کنید. از جمله لیست پل ها و Pluggable Transports هایی که استفاده کرده اید. همچنین شماره نسخه Tor Browser و هر پیغامی که Tor به شما داده است." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "خطوط پل شما در اینجا:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "دریافت پل ها!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "لطفا گزینه نوع پل را انتخاب کنید:" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "آیا شما به آدرس های IPv6 نیاز دارید؟" + +#: lib/bridgedb/strings.py:110 #, python-format +msgid "Do you need a %s?" +msgstr "آیا شما نیاز دارید به یک %s؟" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "مرورگر شما تصاویر را به درستی نمایش نمی دهد." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "کاراکتر ها را از تصویر بالا وارد کنید..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "چگونگی از پل‌های خود استفاده کنید" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "برای وارد کردن پل ها در Tor Browser, دنبال کنید دستورالعمل را در %s Tor\nBrowser صفحه دانلود %s برای شروع Tor Browser." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "اگر \"تور\" شما کار نمیکند، ایمیلی به آدرس %s بفرستید. سعی کنید تا آنجا که ممکن است اطلاعات بیشتری راجع به مشکلتان، شامل لیست پل‌ها، نام و نسخه بسته‌ای که استفاده کردید و پیغام‌های خروجی تور." +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "وقتی که صفحه 'تنظیمات شبکه تور' نمایش داده شد, روی گزینه 'پیکربندی' کلیک کنید و دنبال کنید\nتا زمانی که wizard از شما بپرسد:" -#: lib/bridgedb/templates/bridges.html:10 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "برای استفاده از خطوط بالا، به قسمت تنظیمات شبکه‌ی ویدالیا رفته و گزینه \"سرویس دهنده اینترنت من ارتباط با شبکه تور را مسدود کرده است\" را انتخاب کنید. و آدرس پل‌ها را یکی یکی وارد کنید." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "آیا شرکت ارایه دهنده اینترنت (ISP) شما بلاک می کند و یا سانسور می کند ارتباطات\nشبکه تور شما را؟" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "این پیام را نمایش می دهد." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "درخواست پل‌های عادی" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "درخواست پل‌های IPv6" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "درخواست یک روش Transport جایگزین براساس TYPE" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "دریافت یک کپی از کلید عمومی BridgeDB" + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "گزارش یک باگ" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "کد منبع" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "هیچ پلی درحال حاضر موجود نیست" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "لیست تغییرات" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "مرورگر خود را به فایرفاکس ارتقا دهید" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "تماس" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "دو واژه زیر را تایپ کنید" +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "اوه اوه، کنسرو اسپاگتی!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "مرحله 1" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "در حال حاضر هیچ پل ی در دسترس نیست" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "دریافت %s بسته مرورگر تور %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr " شاید شما باید سعی کنید %s بازگشت %s و انتخاب نوع پل های مختلف!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "مرحله %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "مرحله 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "دانلود %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "مرحله %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "دریافت %s پل‌ها %s" +msgstr "دریافت %sbridge ها %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "مرحله %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "مرحله 3" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "حالا %s اضافه کردن پل ها به Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sف%sقط بده به من پل ها را!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "گزینه های پیشرفته" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "نه" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "هیچ" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sب%sله!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "حالا %s پل‌ها را به تور اضافه کنید %s" +msgid "%sG%set Bridges" +msgstr "%sد%sریافت پل‌ها"

1 0

[bridgedb/develop] Update translation: fr
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 2976d59a3aaa673c724d1c285beaa6b209893c52 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:38:36 2014 +0000 Update translation: fr * THANKS TO fayçal fatihi, Frisson Reynald, hpatte, Lunar, Onizuka, themen, Towinet, and Yannick Heintz. --- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 372 ++++++++++++++++++++++---- 1 file changed, 318 insertions(+), 54 deletions(-) diff --git a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 0dc56bf..05ff96d 100644 --- a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -1,19 +1,26 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# lunar <lunar(a)torproject.org>, 2013 +# apaddlingduck, 2014 +# fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 +# Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 +# hpatte <hadrien.44(a)gmail.com>, 2014 +# Lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 +# Onizuka, 2013 +# themen <themen2004(a)gmail.com>, 2014 +# Towinet, 2014 +# Yannick Heintz, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-10-06 18:20+0000\n" -"Last-Translator: lunar <lunar(a)torproject.org>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-07-02 02:59+0000\n" +"Last-Translator: fayçal fatihi <ofaycal.geo.x(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,82 +29,339 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "Que sont les « bridges » ?" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Désolé ! Quelque chose n'allait pas avec votre demande." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ceci est un message automatique, merci de ne pas répondre.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Voici vos bridges :" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Vous avez dépassé la limite de vitesse. S'il vous plaît ralentissez ! Le temps minimum entre les courriels est %s heures. Tous les autres courriels pendant cette période seront ignorés." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDES: (combiner des commandes pour spécifier plusieurs options en même temps)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Bienvenue à BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "TYPEs de transport pris en charge actuellement:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Salut, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Bonjour, ami !" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Les clés publiques" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s sur %s à%s." -#: lib/bridgedb/templates/base.html:34 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Les bridges %s sont des relais Tor qui vous aident à contourner la censure." +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions au réseau Tor, ce qui rend plus difficile pour tous ceux qui regardent votre trafic Internet de déterminer que vous utilisez Tor.\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Certains ponts avec les adresses IPv6 sont également disponibles, bien que certains Transports soient enfichables ; ils ne sont pas compatibles avec l'IPv6.\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "De plus, BridgeDB a beaucoup de banals ponts %s sans aucun\nTransports Enfichables (Pluggable Transports) %s, ne semblant pas être autant cool, mais pouvant toutefois\naider à contourner la censure Internet dans des nombreux cas.\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "Que sont les bridges ?" -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s sont des relais Tor qui vous aident à contourner la censure." + +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Une autre manière de découvrir des adresses de bridge est d'envoyer un email (à partir d'une adresse en %s ou en %s) à %s avec la ligne « get bridges » dans le corps du message." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email à %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accès suivant: %s ou %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Si votre Tor ne marche pas, vous devriez envoyer un courriel %s." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Essayez d'inclure autant d'infos que possible concernant votre cas, y compris la liste des\nponts et des Transports Enfichables (Pluggable Transports) que vous avez essayé d'utiliser, votre version de Tor Browser,\net n'importes quel autres messages que Tor vous a sorti, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Voici vos lignes des bridges:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Obtenez des bridges!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Sélectionnez vos choix pour le type de bridge, s'il vous plaît:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Avez-vous besoin des adresses IPv6?" + +#: lib/bridgedb/strings.py:110 #, python-format +msgid "Do you need a %s?" +msgstr "Avez-vous besoin un %s?" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Votre navigateur n'affiche pas correctement les images." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Inscrire les caractères de l'image ci-dessus…" + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Comment démarrer l'utilisation de vos Bridges." + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Pour entrer des ponts dans Tor Browser, suivez les instructions sur la %s page de téléchargement de Tor Browser %s pour démarrer Tor Browser." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Si Tor ne fonctionne pas, envoyez un email à %s. Essayez d'inclure autant d'informations que possible concernant votre cas, incluant la liste des bridges que vous avez utilisées, le nom et la version du bundle, les messages que Tor a renvoyé, etc." +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Quand la boite de dialogue 'Paramètres Réseaux Tor' s'affiche, cliquez 'Configurer' et suivez l'assistant jusqu'à ce qu’il demande :" -#: lib/bridgedb/templates/bridges.html:10 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Pour utiliser les lignes ci-dessus, allez dans l'onglet Réseau de Vidalia et cochez « Mon FAI bloque les connexions au réseau Tor ». Puis ajoutez une à une les adresses des bridges." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Est-ce que votre fournisseur d'accès à Internet (FAI) bloquent ou censurent les connexions vers le réseau Tor ?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Sélectionnez 'Oui' et ensuite cliquez 'Suivant'. Pour configurer vos nouvelles bridges, copiez et collez les lignes bridge dans la prochaine case de saisie de texte. Enfin, cliquez 'Connexion', et tout devrait marcher ! Si vous avez des difficultés, essayez le bouton 'Aide' dans 'Paramètres Réseaux Tor' pour plus d’assistance." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Afficher ce message." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "Demander les bridges vanilles." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Demander IPv6 bridges." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Demander un Pluggable Transport par TYPE." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Faire un rapport de Bug" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Aucune bridge n'est actuellement disponible." +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Le code source" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Changez votre navigateur pour Firefox" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Changelog" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Entrez les deux mots" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contact" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Étape 1" +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "Houlà!" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "Il n'y a pas de bridges disponibles en ce moment…" + +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Récupérez le %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Peut-être vous devriez revenir %s en arrière %s et choisir un type différent de bridge !" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Etape %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Étape 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Télécharger %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Etape %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Récupérez les %s addresses de bridge %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Étape 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Etape %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Maintenant %s ajoutez les bridges au navigateur Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sJ%suste me donner les ponts!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Options avancées" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Non" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "aucun" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sO%sui!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Maintenant %s ajoutez les adresses de bridge dans Tor %s" +msgid "%sG%set Bridges" +msgstr "%sO%sbtenir Bridges"

1 0

[bridgedb/develop] Update translation: es
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 5fc827ea60581f16d766590ddd7fd2047888d858 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:04:06 2014 +0000 Update translation: es * THANKS TO Pablo Lezaeta. --- lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po index ef3ed81..22727ad 100644 --- a/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po @@ -5,13 +5,14 @@ # Translators: # Translators: # halbares <pablo.alvarez.flores(a)gmail.com>, 2014 +# Pablo Lezaeta <prflr88(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-03-21 21:50+0000\n" -"Last-Translator: halbares <pablo.alvarez.flores(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-26 19:50+0000\n" +"Last-Translator: Pablo Lezaeta <prflr88(a)gmail.com>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/torproject/language/es_CL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "¿Cuáles son los puentes?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridge relays %s son repetidores de Tor que ayudan a combatir la censura." +msgstr "%s Puentes retrasadores %s son repetidores de Tor que ayudan a combatir la censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" @@ -40,7 +41,7 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "Otra forma de encontrar direcciones de puentes públicos es mediante enviar un correo electrónico (De %s o %s dirección) a %s con la línea 'get bridges' en el cuerpo del mensaje." +msgstr "Otra forma de encontrar direcciones de puentes públicos es mediante enviar un correo electrónico (De %s o %s dirección) a %s con la línea «get bridges» en el cuerpo del mensaje." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -52,14 +53,14 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Si Tor no funciona, por favor envíe un correo electrónico %s. Intente incluir toda la información posible, incluyendo la lista de los puentes que ha utilizado, el paquete nombre_de_archivo/versión que utilizó, los mensajes que Tor devolvió, etc." +msgstr "Si Tor no funciona, por favor envíe un correo %s. Intente incluir toda la información posible, incluyendo la lista de los puentes que ha utilizado, el paquete nombre de archivo/versión que utilizó, los mensajes que Tor devolvió, etc." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "Para utilizar las líneas anteriores, diríjase a la página de configuración de la red de VIdalia, y haga clic en \"Mi ISP bloquea las conexiones a la red Tor\". A continuación, añadir cada dirección puente uno a uno." +msgstr "Para utilizar las líneas anteriores, diríjase a la página de configuración de la red de VIdalia, y haga clic en «Mi ISP bloquea las conexiones a la red Tor». A continuación, añada cada dirección puente una a una." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" @@ -80,7 +81,7 @@ msgstr "Paso 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "Obtenga %s Tor Browser Bundle %s" +msgstr "Obtenga %s Paquete del navegador Tor %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2"

1 0

[bridgedb/develop] Update translation: en_GB
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 623e637607971c0fe354b3ea5fba6989ac168fd6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 06:57:46 2014 +0000 Update translation: en_GB * THANKS TO richardshaylor. --- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 45 ++++++++++------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po index 02bfc36..589b1ed 100644 --- a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po @@ -1,22 +1,24 @@ -# English (United Kingdom) translations for BridgeDB. +# Translations template for BridgeDB. # Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the BridgeDB project. # # Translators: -# runasand <runa.sandvik(a)gmail.com>, 2011 +# Translators: +# richardshaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: en_GB <LL(a)li.org>\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"PO-Revision-Date: 2014-01-21 22:00+0000\n" +"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" @@ -24,7 +26,8 @@ msgstr "What are bridges?" #: lib/bridgedb/templates/base.html:34 #, python-format -msgid "%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship." #: lib/bridgedb/templates/base.html:39 @@ -34,13 +37,10 @@ msgstr "I need an alternative way of getting bridges!" #: lib/bridgedb/templates/base.html:40 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a " -"%s or a %s address) to %s with the line 'get bridges' by itself in the " -"body of the mail." -msgstr "" -"Another way to find public bridge addresses is to send an email (from a " -"%s or a %s address) to %s with the line 'get bridges' by itself in the " -"body of the mail." +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -49,23 +49,17 @@ msgstr "My bridges don't work! I need help!" #: lib/bridgedb/templates/base.html:49 #, python-format msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info" -" about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" -"If your Tor doesn't work, you should email %s. Try including as much info" -" about your case as you can, including the list of bridges you used, the " +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." +msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" @@ -105,4 +99,3 @@ msgstr "Step 3" #, python-format msgid "Now %s add the bridges to Tor %s" msgstr "Now %s add the bridges to Tor %s" -

1 0

r26893: {website} added new osx instructions and screenshot showing the .dmg f (in website/trunk: images projects/en)
by tor-svn＠svn.torproject.org 25 Jul '14

25 Jul '14

Author: Sherief Date: 2014-07-25 20:40:33 +0000 (Fri, 25 Jul 2014) New Revision: 26893 Modified: website/trunk/images/screenshot-osx-torbrowser-icon.png website/trunk/projects/en/torbrowser.wml Log: added new osx instructions and screenshot showing the .dmg file instead of the .app one. Modified: website/trunk/images/screenshot-osx-torbrowser-icon.png =================================================================== (Binary files differ) Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-07-25 18:27:34 UTC (rev 26892) +++ website/trunk/projects/en/torbrowser.wml 2014-07-25 20:40:33 UTC (rev 26893) @@ -312,10 +312,10 @@ <div class="macosx box"> <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> - <p>Download the file above, save it somewhere, then click on it. - Mac OS X will automatically unarchive it and you will have a TorBrowser application - in your chosen language. <em>(e.g. TorBrowser_en-US.app)</em></p> - <p>Click the TorBrowser application to launch Tor Browser.</p> + <p>Download the file above, save it somewhere, then click on it, + add the .dmg file inside your Applications folder and you will + have a Tor Browser application in your chosen language that you + can pin on your Dock.</p> </div> <div class="pjimage"><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" width="414" height="315"></div> </div>

1 0

r26892: {website} Link to changelogs instead of staticly mirroring git (website/trunk/projects/en)
by Matt Pagan 25 Jul '14

25 Jul '14

Author: mttp Date: 2014-07-25 18:27:34 +0000 (Fri, 25 Jul 2014) New Revision: 26892 Modified: website/trunk/projects/en/torbrowser-details.wml Log: Link to changelogs instead of staticly mirroring git Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2014-07-25 17:47:54 UTC (rev 26891) +++ website/trunk/projects/en/torbrowser-details.wml 2014-07-25 18:27:34 UTC (rev 26892) @@ -20,21 +20,13 @@ <h3 id="contents">Stable Bundle contents</h3> <ul> - - <li>Mozilla Firefox 24.6.0 ESR</li> - <li>Tor 0.2.4.22</li> - <li>OpenSSL 1.0.1h</li> - <li>NoScript 2.6.8.28</li> - <li>Tor Launcher 0.2.5.5</li> - <li>Torbutton 1.6.10.0</li> - <li>HTTPS-Everywhere 3.5.3</li> - + <li><a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/refs/tag…">ChangeLog</a>.</li> </ul> - <h3 id="alphacontents">Alpha Bundle Contents</h3> + <h3 id="alphacontents">Alpha Bundle contents</h3> <ul> - <li>Currently, no alpha release is available</li> + <li><a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/Bu…">ChangeLog</a>.</li> </ul> <h3 id="build">Building the bundle</h3>

1 0

r26891: {website} Tor Browser Bundle to Tor Browser on download-easy (website/trunk/download/en)
by Matt Pagan 25 Jul '14

25 Jul '14

Author: mttp Date: 2014-07-25 17:47:54 +0000 (Fri, 25 Jul 2014) New Revision: 26891 Modified: website/trunk/download/en/download-easy.wml Log: Tor Browser Bundle to Tor Browser on download-easy Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2014-07-25 17:38:45 UTC (rev 26890) +++ website/trunk/download/en/download-easy.wml 2014-07-25 17:47:54 UTC (rev 26891) @@ -10,10 +10,10 @@ <define-tag lang>en-US</define-tag> # -<define-tag button-win-tbb32>Tor Browser Bundle</define-tag> +<define-tag button-win-tbb32>Tor Browser</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> -<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> -<define-tag button-lin-tbb32>Tor Browser Bundle</define-tag> +<define-tag button-osx-tbb32>Tor Browser</define-tag> +<define-tag button-lin-tbb32>Tor Browser</define-tag> <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag> #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" @@ -38,7 +38,7 @@ <div id="windows" class="easy windows"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser Bundle for Windows</h2> + <h2>Tor Browser for Windows</h2> <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em> <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> @@ -59,7 +59,7 @@ <div id="mac" class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser Bundle for Mac</h2> + <h2>Tor Browser for Mac</h2> <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> @@ -80,7 +80,7 @@ <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser Bundle for GNU/Linux</h2> + <h2>Tor Browser for GNU/Linux</h2> <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> <a href="<page projects/torbrowser>">Learn more »</a></p> @@ -102,7 +102,7 @@ <div class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2> + <h2>Tor Browser for 64-Bit GNU/Linux</h2> <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> @@ -203,7 +203,7 @@ run it. Tor only protects your applications that are properly configured to send their Internet traffic through Tor. To avoid problems with Tor configuration, we strongly recommend you use the <a href="<page -projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to +projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect your privacy and anonymity on the web as long as you're browsing with the Tor Browser itself. Almost any other web browser configuration is likely to be unsafe to use with Tor.</p> @@ -236,7 +236,7 @@ href="<page about/overview>#thesolution">to and within the Tor network</a>, but the encryption of your traffic to the final destination website depends upon on that website. To help -ensure private encryption to websites, the Tor Browser Bundle includes +ensure private encryption to websites, the Tor Browser includes <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the use of HTTPS encryption with major websites that support it. However, you should still watch the browser URL bar to

1 0

r26890: {website} Tor Browser in project page title (not a bundle). (website/trunk/projects/en)
by Matt Pagan 25 Jul '14

25 Jul '14

Author: mttp Date: 2014-07-25 17:38:45 +0000 (Fri, 25 Jul 2014) New Revision: 26890 Modified: website/trunk/projects/en/torbrowser.wml Log: Tor Browser in project page title (not a bundle). Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-07-25 17:36:01 UTC (rev 26889) +++ website/trunk/projects/en/torbrowser.wml 2014-07-25 17:38:45 UTC (rev 26890) @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 1-high -#include "tbb-head.wmi" TITLE="Tor Browser Bundle" CHARSET="UTF-8" +#include "tbb-head.wmi" TITLE="Tor Browser" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs">

1 0

r26889: {website} Update (and de-automate) torbrowser-details page. (website/trunk/projects/en)
by Matt Pagan 25 Jul '14

25 Jul '14

Author: mttp Date: 2014-07-25 17:36:01 +0000 (Fri, 25 Jul 2014) New Revision: 26889 Modified: website/trunk/projects/en/torbrowser-details.wml Log: Update (and de-automate) torbrowser-details page. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2014-07-24 00:39:25 UTC (rev 26888) +++ website/trunk/projects/en/torbrowser-details.wml 2014-07-25 17:36:01 UTC (rev 26889) @@ -20,17 +20,21 @@ <h3 id="contents">Stable Bundle contents</h3> <ul> - <li>Vidalia <version-torbrowser-vidalia></li> - <li>Tor <version-torbrowser-tor></li> - <li>Mozilla Firefox ESR and Torbutton <version-torbrowser-torbutton></li> + + <li>Mozilla Firefox 24.6.0 ESR</li> + <li>Tor 0.2.4.22</li> + <li>OpenSSL 1.0.1h</li> + <li>NoScript 2.6.8.28</li> + <li>Tor Launcher 0.2.5.5</li> + <li>Torbutton 1.6.10.0</li> + <li>HTTPS-Everywhere 3.5.3</li> + </ul> <h3 id="alphacontents">Alpha Bundle Contents</h3> <ul> - <li>Vidalia <version-vidalia-alpha></li> - <li>Tor <version-alpha></li> - <li>Mozilla Firefox <version-torbrowser-firefox> and Torbutton <version-torbrowser-torbutton></li> + <li>Currently, no alpha release is available</li> </ul> <h3 id="build">Building the bundle</h3>

1 0

[tor/master] Implement proposal 221: Stop sending CREATE_FAST
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit e001610c99bea661dbefc693ec173a90fcb3ee5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 16:44:14 2013 -0400 Implement proposal 221: Stop sending CREATE_FAST This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and makes the behavior of "auto" be "look at the consensus." --- changes/prop221 | 6 ++++++ doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 +++++--- src/or/config.c | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/changes/prop221 b/changes/prop221 new file mode 100644 index 0000000..b2bf44b --- /dev/null +++ b/changes/prop221 @@ -0,0 +1,6 @@ + o Minor features: + - Stop sending the CREATE_FAST cells by default; instead, use a + parameter in the consensus to decide whether to use + CREATE_FAST. This can improve security on connections where + Tor's circuit handshake is stronger than the available TLS + connection security levels. Implements proposal 221. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 779db61..4f3612b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1119,15 +1119,17 @@ The following options are useful only for clients (that is, if the node "foo". Disabled by default since attacking websites and exit relays can use it to manipulate your path selection. (Default: 0) -[[FastFirstHopPK]] **FastFirstHopPK** **0**|**1**:: +[[FastFirstHopPK]] **FastFirstHopPK** **0**|**1**|**auto**:: When this option is disabled, Tor uses the public key step for the first hop of creating circuits. Skipping it is generally safe since we have already used TLS to authenticate the relay and to establish forward-secure - keys. Turning this option off makes circuit building slower. + + keys. Turning this option off makes circuit building a little + slower. Setting this option to "auto" takes advice from the authorities + in the latest consensus about whether to use this feature. + + Note that Tor will always use the public key step for the first hop if it's operating as a relay, and it will never use the public key step if it - doesn't yet know the onion key of the first hop. (Default: 1) + doesn't yet know the onion key of the first hop. (Default: auto) [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2b4d3c3..4603de0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -663,16 +663,18 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ) if (!circ->cpath->extend_info->onion_key) return 1; /* our hand is forced: only a create_fast will work. */ - if (!options->FastFirstHopPK) - return 0; /* we prefer to avoid create_fast */ if (public_server_mode(options)) { /* We're a server, and we know an onion key. We can choose. * Prefer to blend our circuit into the other circuits we are * creating on behalf of others. */ return 0; } + if (options->FastFirstHopPK == -1) { + /* option is "auto", so look at the consensus. */ + return networkstatus_get_param(NULL, "usecreatefast", 1, 0, 1); + } - return 1; + return options->FastFirstHopPK; } /** Return true if <b>circ</b> is the type of circuit we want to count diff --git a/src/or/config.c b/src/or/config.c index a2811eb..1de9187 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -236,7 +236,7 @@ static config_var_t option_vars_[] = { OBSOLETE("FallbackNetworkstatusFile"), V(FascistFirewall, BOOL, "0"), V(FirewallPorts, CSV, ""), - V(FastFirstHopPK, BOOL, "1"), + V(FastFirstHopPK, AUTOBOOL, "auto"), V(FetchDirInfoEarly, BOOL, "0"), V(FetchDirInfoExtraEarly, BOOL, "0"), V(FetchServerDescriptors, BOOL, "1"),

1 0