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

[tpo/master] Fix .htaccess-membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 84f1011ca792d76ff099f9fc53335f5ff09969e7 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:38:52 2020 +0200 Fix .htaccess-membership --- .htaccess-membership | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership index 5651511f..0f113839 100644 --- a/.htaccess-membership +++ b/.htaccess-membership @@ -1,5 +1,4 @@ AuthType Basic - AuthName "Secure Content" - AuthUserFile .htpasswd - require valid-user - +AuthName "Secure Content" +AuthUserFile .htpasswd +require valid-user

1 0

[tpo/master] Update membership.html
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 0bd20a54faa956d379932d833cb76d9ca77bdb01 Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 27 18:11:46 2020 +0000 Update membership.html --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 6d915086..50308a75 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -80,7 +80,7 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0

[tpo/master] Merge remote-tracking branch 'gl/patch-1' into staging
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 8497521629a3e702e9b5678b06627331765914c9 Merge: 323d5aa1 0bd20a54 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 20:59:50 2020 +0200 Merge remote-tracking branch 'gl/patch-1' into staging templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Merge branch 'staging'
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 7966c0d197d74c7f5da1f30077a90e5e826b3391 Merge: ae36d114 84975216 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 21:00:25 2020 +0200 Merge branch 'staging' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Add .htaccess-membership to add http auth to /about/membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit ae36d114f8a919c1b4e418dd1d447898c5258a09 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:10:29 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new file mode 100644 index 00000000..64537967 --- /dev/null +++ b/.htaccess-membership @@ -0,0 +1,4 @@ +AuthType Basic + AuthName "Secure Content" + AuthUserFile .htpasswd + require valid-user

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 27 Jul '20

27 Jul '20

commit ab59a632d991aeb33ac151a9815a8d180c480db9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 18:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index 1c9582badb..c8ccbde078 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -588,12 +588,12 @@ msgstr "CVC" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:399 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:472 msgid "Choose your size and fit." -msgstr "" +msgstr "اختر مقاسك و الملائم" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:404 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:412 msgid "T-shirt:" -msgstr "" +msgstr "قميص:" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:422 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:426 @@ -603,7 +603,7 @@ msgstr "تعليقات" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:434 msgid "Donating:" -msgstr "" +msgstr "التبرع:" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:446 msgid "Donate" @@ -611,15 +611,15 @@ msgstr "تبرّع" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:456 msgid "State/Province/Region" -msgstr "" +msgstr "الدولة / المقاطعة / المنطقة" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:460 msgid "Gift Selected:" -msgstr "" +msgstr "الهدية المختارة:" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:464 msgid "No Gift Selected" -msgstr "" +msgstr "لم يتم تحديد هدية" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:468 msgid "Sticker Pack"

1 0

[tor/master] Fix documentation of cache_failure_intro_lookup
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 98d84587a8e9723f1c964e03de9364508be04b2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 14:22:10 2020 -0400 Fix documentation of cache_failure_intro_lookup Closes ticket 17793 --- src/feature/rend/rendcache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c index 0890a81d8f..53fec7532f 100644 --- a/src/feature/rend/rendcache.c +++ b/src/feature/rend/rendcache.c @@ -340,8 +340,9 @@ rend_cache_failure_purge(void) /** Lookup the rend failure cache using a relay identity digest in * <b>identity</b> which has DIGEST_LEN bytes and service ID <b>service_id</b> - * which is a null-terminated string. If found, the intro failure is set in - * <b>intro_entry</b> else it stays untouched. Return 1 iff found else 0. */ + * which is a null-terminated string. If @a intro_entry is provided, then it + * is set to the entry on success, and to NULL on failure. + * Return 1 iff found else 0. */ STATIC int cache_failure_intro_lookup(const uint8_t *identity, const char *service_id, rend_cache_failure_intro_t **intro_entry)

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 27 Jul '20

27 Jul '20

commit ef35fa2cd314d7874b67d7d40d782cc2041ec7d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 18:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 46 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index e49856f45b..1c9582badb 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -19,10 +19,11 @@ # erinm, 2019 # Ahmed IB <mee.tbhole(a)gmail.com>, 2020 # Muhammad Elghdban <Mohamed.Elghdban(a)gmail.com>, 2020 +# Abdullah Nasib <nomadweb(a)protonmail.ch>, 2020 # msgid "" msgstr "" -"Last-Translator: Muhammad Elghdban <Mohamed.Elghdban(a)gmail.com>, 2020\n" +"Last-Translator: Abdullah Nasib <nomadweb(a)protonmail.ch>, 2020\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" @@ -113,7 +114,7 @@ msgstr "تبرع لمشروع تور." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 msgid "summary_large_image" -msgstr "" +msgstr "تلخيص الصورة" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:62 msgid "@torproject" @@ -390,7 +391,7 @@ msgstr "العودة إلى صفحة التبرع" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:40 msgid "See if your employer offers employee gift matching" -msgstr "" +msgstr "تحقق مما إذا كان صاحب العمل يقدم مطابقة هدايا الموظف" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:70 msgid "Company" @@ -398,7 +399,7 @@ msgstr "الشركة" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:78 msgid "Matching Conditions" -msgstr "" +msgstr "شروط المطابقة" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:86 msgid "Contact Information" @@ -419,6 +420,8 @@ msgid "" "This page requires Javascript to do PayPal or credit card\n" " donations, but it appears you have Javascript disabled." msgstr "" +"تتطلب هذه الصفحة جافا سكريبت للقيام باي بال أو بطاقة الائتمان\n" +"التبرعات ، ولكن يبدو أن جافا سكريبت معطلة لديك." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:88 #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:120 @@ -428,6 +431,9 @@ msgid "" " <a href=\"https://www.torproject.org/donate/donate-options.html.en\">other " "donations options page</a>." msgstr "" +"إذا كنت ترغب في التبرع دون تمكين جافا سكريبت ، يرجى إلقاء نظرة على<a " +"href=\"https://www.torproject.org/donate/donate-options.html.en\"> صفحة " +"خيارات التبرعات الأخرى</a>." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:109 msgid "Number of Donations" @@ -435,11 +441,11 @@ msgstr "عدد التبرعات" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:125 msgid "Total Donated" -msgstr "" +msgstr "إجمالي التبرع" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:141 msgid "Total Raised with Mozilla's Match" -msgstr "" +msgstr "تم رفع مجموع مع تطابق Mozilla's" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:152 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:158 @@ -456,11 +462,11 @@ msgstr "شهري" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:167 msgid "Want to donate cryptocurrency?" -msgstr "" +msgstr "هل تريد التبرع بالعملات المشفرة؟" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:172 msgid "Want to donate stock or via postal mail?" -msgstr "" +msgstr "هل تريد التبرع بالأسهم أو بالبريد العادي؟" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:187 msgid "invalid amount" @@ -468,15 +474,15 @@ msgstr "مبلغ غير صحيح" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:191 msgid "$2 minimum donation" -msgstr "" +msgstr "الحد الأدنى للتبرع 2 دولار" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:195 msgid "$ other" -msgstr "" +msgstr "$ أخرى" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:202 msgid "Choose your gift as a token of our thanks." -msgstr "" +msgstr "اختر هديتك كرمز شكرنا." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:209 msgid "No thanks, I don't want a gift." @@ -485,25 +491,25 @@ msgstr "لا شكرا ، أنا لا أريد هدية." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:211 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." -msgstr "" +msgstr "أفضل 100٪ من تبرعي للذهاب إلى عمل مشروع Tor." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:222 msgid "sticker Pack" -msgstr "" +msgstr "حزمة ملصقات" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:229 msgid "" "A collection of our favorite logo stickers for decorating your stuff and " "covering your cams." -msgstr "" +msgstr "مجموعة من ملصقات الشعار المفضلة لدينا لتزيين أغراضك وتغطية كاميراتك." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:239 msgid "t-shirt" -msgstr "" +msgstr "قميص" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:247 msgid "Get our limited edition Take Back the Internet With Tor shirt." -msgstr "" +msgstr "احصل على إصدارنا المحدود Take Back the Internet مع قميص Tor." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:258 msgid "t-shirt pack" @@ -521,11 +527,11 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:284 msgid "Your generous support of Tor gets you this high-quality zip hoodie." -msgstr "" +msgstr "دعمك السخي لـ Tor يمنحك هذا زنط بسحاب عالي الجودة." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to <span class=\"lime\">DONATE</span>?" -msgstr "" +msgstr "كيف تريد <span class=\"lime\">التبرع</span>؟" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:300 msgid "Credit Card" @@ -533,7 +539,7 @@ msgstr "بطاقة ائتمان" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:314 msgid "* required fields" -msgstr "" +msgstr "* الحقول المطلوبة" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:329 msgid "Street Address" @@ -561,7 +567,7 @@ msgstr "ادخل العنوان الإلكتروني" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:362 msgid "We‘ll email you your receipt" -msgstr "" +msgstr "إيصالك البريد الإلكتروني الخاص بك" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:376 msgid "Card Number"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 27 Jul '20

27 Jul '20

commit a951fbeeb87cf2957ae10cc64bca32a0ef3796dc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 17:16:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index 08e3652f15..73fc33b6f3 100644 --- a/es.po +++ b/es.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-27 16:56+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 27 Jul '20

27 Jul '20

commit 500c84f0035e2466929b4b046a769d82763f3dbc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 17:15:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index 5ca98e5ef5..4fe03e593d 100644 --- a/es.po +++ b/es.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-27 16:56+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -667,13 +667,13 @@ msgstr "Mantener archivos almacenados en la capeta 'Persistent'" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Welcome Screen" -msgstr "" +msgstr "Pantalla de bienvenida" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "" "Beta: only the additional setting to enable the Unsafe Browser is made " "persistent" -msgstr "" +msgstr "Beta: sólo se hace persistente el ajuste adicional para activar el Navegador Inseguro" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks"

1 0