[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 015715544db99dd2298748d27fdb8e111c94e5a0 Author: Translation commit bot Date: Sat Nov 16 07:22:54 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 6 +++--- contents+tr.po | 26 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 57b96d0f5..ebf37cab4 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,9 +3,9 @@ # David Georges, 2019 # N W, 2019 # erinm, 2019 -# Emma Peel, 2019 # PoorPockets McNewHold , 2019 # AO , 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: AO , 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6443,7 +6443,7 @@ msgid "" msgstr "" "Une signature cryptographique prouve lâauthenticité dâun message ou dâun " "fichier. Elle est créée par le détenteur de la partie privée dâune biclé de " -"[cryptographie par clé publique]#public-key-cryptography) et peut être " +"[cryptographie par clé publique](#public-key-cryptography) et peut être " "vérifiée par la clé publique correspondante. Si vous téléchargez des " "logiciels de torproject.org, vous la trouverez sous la forme de fichiers de " "signature (.asc). Ce sont des signatures PGP afin que vous puissiez vérifier" diff --git a/contents+tr.po b/contents+tr.po index 5cc188e55..ac53f4e06 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -4712,6 +4712,9 @@ msgid "" "See [portforward.com](https://portforward.com/) for directions on how to " "port forward with your NAT/router device." msgstr "" +"Adres dönüÅtürücü (NAT) ya da yöneltici (router) aygıtınız üzerinde kapı " +"numarası yönlendirme iÅlemlerinin nasıl yapılacaÄı ile ilgili bilgi almak " +"için [portforward.com](https://portforward.com/) adresine bakabilirsiniz." #: https//support.torproject.org/operators/behind-nat/ #: (content/operators/behind-nat/contents+en.lrquestion.description) @@ -5437,6 +5440,11 @@ msgid "" "Understanding and Improving Entry Guard Selection in " "Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)." msgstr "" +"Ayrıntılı bilgi almak için [Åu günlük " +"yazısına](https://blog.torproject.org/blog/lifecycle-of-a-new-relay) ya da " +"[Changing of the Guards: A Framework for Understanding and Improving Entry " +"Guard Selection in Tor](https://www.freehaven.net/anonbib/#wpes12-cogs.pdf) " +"makalesine bakabilirsiniz." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.title) @@ -6304,6 +6312,7 @@ msgstr "* Ä°kinci sırada köprü aktarıcıları bulunur." #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.title) msgid "Why do I get portscanned more often when I run a Tor relay?" msgstr "" +"Bir Tor aktarıcısı iÅlettiÄimde neden daha sık kapı taraması görüyorum?" #: https//support.torproject.org/operators/why-i-get-portscanned-more-often/ #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.description) @@ -6316,6 +6325,15 @@ msgid "" "from you might attract the attention of other users on the IRC server, " "website, etc. who want to know more about the host they're relaying through." msgstr "" +"ÃıkıŠbaÄlantılarına izin veriyorsanız, kiÅilerin aktaracınız üzerinden " +"baÄlandıÄı bazı hizmetler sizinle ilgili daha fazla bilgi toplamak için " +"geriye bazı baÄlantılar kurar. ÃrneÄin, bazı IRC sunucuları hangi " +"kullanıcının baÄlantıyı yaptıÄını kaydetmek için identd kapı numarası ile " +"baÄlantı kurar (aslında bu onların iÅine yaramaz, çünkü Tor bu bilgiyi " +"bilmez ancak yine de denerler). Ayrıca, aktarıcınız üzerinden çıkan " +"kullanıcılar, IRC sunucusu, web sitesi gibi kaynaklar üzerindeki kendilerine" +" aktarım yapan sunucu hakkında daha fazla bilgi almak isteyen diÄer " +"kullanıcıların dikkatini çekebilir." #: https//support.torproject.org/operators/why-i-get-portscanned-more-often/ #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.description) @@ -6324,6 +6342,10 @@ msgid "" " learned that sometimes Tor relays expose their socks port to the world. We " "recommend that you bind your socksport to local networks only." msgstr "" +"DiÄer bir neden ise, Ä°nternet üzerinde bulunan açık vekil sunucuları tarayan" +" grupların, bazen Tor aktarıcılarının socks kapı numaralarını dünyaya " +"yayınladıÄını öÄrenmiÅ olmalarıdır. Socks kapı numaralarını yalnız yerel " +"aÄlara baÄlanacak Åekilde yapılandırmanız önerilir." #: https//support.torp
[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
commit ece244d70872740e296ed5387f4fb42501da6bf1 Author: Translation commit bot Date: Sat Nov 16 07:15:38 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 11 +++ 1 file changed, 11 insertions(+) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index bc5eb3907..343ffca86 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -2832,12 +2832,19 @@ msgid "" "censorship protections to the next level, and optimizing our development of " "Tor Browser for Android." msgstr "" +"DesteÄiniz sayesinde, Tor aÄının kapasitesini ve ölçeklenebilirliÄini " +"artırmak, sansür karÅıtı korumalarımızı bir sonraki düzeye çıkarmak ve " +"Android için Tor Browser uygulama geliÅtirme çalıÅmalarımızı iyileÅtirmek " +"gibi iddialı projelerle baÅa çıkabileceÄiz." #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:78 msgid "" "Tell family, friends, and colleagues that you're supporting privacy and " "security and taking back the internet with Tor!" msgstr "" +"Ailenize, arkadaÅlarınıza ve iÅ arkadaÅlarınıza kiÅisel gizlilik ve " +"güvenliÄi desteklediÄinizi ve Tor kullanarak Ä°nterneti geri aldıÄınızı " +"söyleyin!" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453 msgid "Gift Selected" @@ -2850,6 +2857,10 @@ msgid "" "in our defense against the growing threats to privacy, freedom of " "expression, and access to information online." msgstr "" +"KiÅisel Gizlilik Koruyucuları, $1,000 ve üzerinde olan önemli miktarda baÄıÅ" +" yaparak, kiÅisel gizliliÄin korunmasına, ifade özgürlüÄüne ve çevrimiçi " +"bilgiye eriÅilmesine yönelik giderek artan tehditlere karÅı hızla önlem " +"almamızı saÄlayan, kararlı ve güvenilir bir baÄıŠkaynaÄı saÄlar." #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:87 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 7762158117361d84d06b59f663ca46eb0693d907 Author: Translation commit bot Date: Sat Nov 16 06:52:50 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index f915ae9b9..5cc188e55 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -4,8 +4,8 @@ # erinm, 2019 # Lale FatoÅ Tunçman , 2019 # dersteppenwolfx, 2019 -# Kaya Zeren , 2019 # Emma Peel, 2019 +# Kaya Zeren , 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Kaya Zeren , 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1087,6 +1087,9 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" +"Onion routing günlük kullanılan bir terim olsa bile, Tor Donanma AraÅtırma " +"Laboratuvarları tarafından yürütülen gerçek [onion routing " +"projesi](https://www.onion-router.net/) içinden çıktı." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -2868,6 +2871,11 @@ msgid "" "Browser](https://support.torproject.org/#tbb-10), it is common for anti-" "virus / anti-malware software to cause this type of issue." msgstr "" +"Bir virusten korunma uygulaması kullanıyorsanız [Virüs ya da kötü amaçlı " +"yazılımdan korunma uygulamam Tor Browser kullanmamı " +"engelliyor](https://support.torproject.org/#tbb-10) bölümüne bakabilirsiniz." +" Bu tür bir soruna genellikle virüs ya da kötü amaçlı yazılımdan korunma " +"uygulamaları yol açar." #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.title) @@ -3072,6 +3080,8 @@ msgid "" "In practice, alas, it's [way more complex than that](https://fscked.org/blog"; "/fully-automated-active-https-cookie-hijacking)." msgstr "" +"Ancak pratikte [durum bundan daha karıÅıktır](https://fscked.org/blog/fully-"; +"automated-active-https-cookie-hijacking)." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -3155,6 +3165,12 @@ msgid "" "but if you need NTLM authentication, you may find [this post in the " "archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful." msgstr "" +"Vekil sunucunuz için kimlik doÄrulaması gerekiyorsa, HTTPProxyAuthenticator " +"ve HTTPSProxyAuthenticator ayarlarının ne olduÄuna da bakın. Åu anda yalnız " +"temel kimlik doÄrulama yöntemini destekliyoruz. Bununla birlikte NTLM kimlik" +" doÄrulama yöntemini kullanmanız gerekiyorsa [bu arÅiv " +"yazısı](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) iÅinize " +"yarayabilir." #: https//support.torproject.org/tbb/tbb-47/ #: (content/tbb/tbb-47/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
commit 730b94cb685d920c68e5612c41e49a8c7b50236c Author: Translation commit bot Date: Sat Nov 16 05:45:43 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 4 1 file changed, 4 insertions(+) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index 69bf88e61..bc5eb3907 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -2617,12 +2617,16 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:608 msgid "https://help.torproject.org/tsa/\";>Tor Sysadmin Team" msgstr "" +"https://help.torproject.org/tsa/\";>Tor Sistem Yöneticileri " +"Ekibi" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:612 msgid "" "https://help.torproject.org/tsa/doc/hardware-"; "requirements/\">Hardware requirements" msgstr "" +"https://help.torproject.org/tsa/doc/hardware-"; +"requirements/\">Donanım gereksinimleri" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:618 #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:580 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
commit a7ca6db44b0a22718d97cfb448a781a4b8ba531f Author: Translation commit bot Date: Sat Nov 16 05:15:43 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index c49da9ad2..69bf88e61 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -2611,6 +2611,8 @@ msgid "" "already existing operating system as well, but we prefer to run the entire " "stack ourselves." msgstr "" +"Tor projesinin bir iÅletim sistemi üzerinde yalnız *hizmetleri* çalıÅtırması" +" da mümkündür. Ancak tüm yıÄını kendimiz çalıÅtırmayı yeÄliyoruz." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:608 msgid "https://help.torproject.org/tsa/\";>Tor Sysadmin Team" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
commit 5eab6bf90e563642e018354ab888d43fe8a0f673 Author: Translation commit bot Date: Sat Nov 16 00:21:27 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd --- tr/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd index 74068bae3..d8e3612f0 100644 --- a/tr/abouttbupdate.dtd +++ b/tr/abouttbupdate.dtd @@ -1,6 +1,6 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
commit 34d0278a07bfaaf12a84e523d2cc6d04ff567e5c Author: Translation commit bot Date: Sat Nov 16 00:21:33 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed --- tr/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd index 74068bae3..d8e3612f0 100644 --- a/tr/abouttbupdate.dtd +++ b/tr/abouttbupdate.dtd @@ -1,6 +1,6 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: expect .md files, not .dox files
commit 625ad6538248cb2ffba7bc2aebb894e91f1a0872 Author: Nick Mathewson Date: Fri Nov 15 09:23:10 2019 -0500 Doxygen: expect .md files, not .dox files Also, I have to add src/rust/registry to the excluded paths, since it includes .md files that Doxygen can't handle. --- Doxyfile.in | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index c8b85f750..c99f536e6 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -320,7 +320,7 @@ OPTIMIZE_OUTPUT_SLICE = NO # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. -EXTENSION_MAPPING = dox=md h=C c=C inc=C +EXTENSION_MAPPING = dox=md h=C c=C inc=C md=md # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable @@ -847,8 +847,8 @@ INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.h \ - *.dox \ - *.inc + *.inc \ + *.md # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. @@ -865,7 +865,8 @@ RECURSIVE = YES EXCLUDE= ./src/ext \ ./src/trunnel \ - ./src/test + ./src/test \ + ./src/rust/registry # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: rename all .dox files to end with .md
commit 8b91680d5c57fc35275b32aea57555d8ef7d61ba
Author: Nick Mathewson
Date: Fri Nov 15 09:27:26 2019 -0500
Doxygen: rename all .dox files to end with .md
Using a standard ending here will let other tools that expect
markdown understand our output here.
This commit was automatically generated with:
for fn in $(find src -name '*.dox'); do \
git mv "$fn" "${fn%.dox}.md"; \
done
---
src/app/{app.dox => app.md} | 0
src/app/config/{app_config.dox => app_config.md} | 0
src/app/main/{app_main.dox => app_main.md} | 0
src/core/{core.dox => core.md} | 0
src/core/crypto/{core_crypto.dox => core_crypto.md} | 0
src/core/mainloop/{core_mainloop.dox => core_mainloop.md}| 0
src/core/or/{core_or.dox => core_or.md} | 0
src/core/or/{dataflow.dox => dataflow.md}| 0
src/core/proto/{core_proto.dox => core_proto.md} | 0
src/feature/api/{feature_api.dox => feature_api.md} | 0
src/feature/client/{feature_client.dox => feature_client.md} | 0
src/feature/control/{feature_control.dox => feature_control.md} | 0
src/feature/dirauth/{feature_dirauth.dox => feature_dirauth.md} | 0
src/feature/dircache/{feature_dircache.dox => feature_dircache.md} | 0
src/feature/dirclient/{feature_dirclient.dox => feature_dirclient.md}| 0
src/feature/dircommon/{feature_dircommon.dox => feature_dircommon.md}| 0
src/feature/dirparse/{feature_dirparse.dox => feature_dirparse.md} | 0
src/feature/{feature.dox => feature.md} | 0
src/feature/hibernate/{feature_hibernate.dox => feature_hibernate.md}| 0
src/feature/hs/{feature_hs.dox => feature_hs.md} | 0
src/feature/hs_common/{feature_hs_common.dox => feature_hs_common.md}| 0
src/feature/keymgt/{feature_keymgt.dox => feature_keymgt.md} | 0
src/feature/nodelist/{feature_nodelist.dox => feature_nodelist.md} | 0
src/feature/relay/{feature_relay.dox => feature_relay.md}| 0
src/feature/rend/{feature_rend.dox => feature_rend.md} | 0
src/feature/stats/{feature_stats.dox => feature_stats.md}| 0
src/lib/arch/{lib_arch.dox => lib_arch.md} | 0
src/lib/buf/{lib_buf.dox => lib_buf.md} | 0
src/lib/cc/{lib_cc.dox => lib_cc.md} | 0
src/lib/compress/{lib_compress.dox => lib_compress.md} | 0
src/lib/conf/{lib_conf.dox => lib_conf.md} | 0
src/lib/confmgt/{lib_confmgt.dox => lib_confmgt.md} | 0
src/lib/container/{lib_container.dox => lib_container.md}| 0
src/lib/crypt_ops/{certs.dox => certs.md}| 0
src/lib/crypt_ops/{lib_crypt_ops.dox => lib_crypt_ops.md}| 0
src/lib/ctime/{lib_ctime.dox => lib_ctime.md}| 0
src/lib/defs/{lib_defs.dox => lib_defs.md} | 0
src/lib/dispatch/{lib_dispatch.dox => lib_dispatch.md} | 0
src/lib/encoding/{lib_encoding.dox => lib_encoding.md} | 0
src/lib/err/{lib_err.dox => lib_err.md} | 0
src/lib/evloop/{lib_evloop.dox => lib_evloop.md} | 0
src/lib/evloop/{time_periodic.dox => time_periodic.md} | 0
src/lib/fdio/{lib_fdio.dox => lib_fdio.md} | 0
src/lib/fs/{lib_fs.dox => lib_fs.md} | 0
src/lib/geoip/{lib_geoip.dox => lib_geoip.md}| 0
src/lib/intmath/{lib_intmath.dox => lib_intmath.md} | 0
src/lib/{lib.dox => lib.md} | 0
src/lib/lock/{lib_lock.dox => lib_lock.md} | 0
src/lib/log/{lib_log.dox => lib_log.md} | 0
src/lib/malloc/{lib_malloc.dox => lib_malloc.md} | 0
src/lib/math/{lib_math.dox => lib_math.md} | 0
src/lib/memarea/{lib_memarea.dox => lib_memarea.md} | 0
src/lib/meminfo/{lib_meminfo.dox => lib_meminfo.md} | 0
src/lib/net/{lib_net.dox => lib_net.md} | 0
src/lib/osinfo/{lib_osinfo.dox => lib_osinfo.md} | 0
src/lib/process/{lib_process.dox => lib_process.md} | 0
src/lib/pubsub/{lib_pubsub.dox => lib_pubsub.md} | 0
src/lib/sandbox/{lib_sandbox.dox => lib_sandbox.md} | 0
src/lib/smartlist_core/{lib_smar
[tor-commits] [tor/master] Process "dox" files as regular markdown.
commit 108d2967a7d492d6bdaf03a294491495452ba214 Author: Nick Mathewson Date: Fri Nov 15 09:20:51 2019 -0500 Process "dox" files as regular markdown. --- Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index a55175957..c8b85f750 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -320,7 +320,7 @@ OPTIMIZE_OUTPUT_SLICE = NO # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. -EXTENSION_MAPPING = dox=C h=C c=C inc=C +EXTENSION_MAPPING = dox=md h=C c=C inc=C # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: remove /** and **/ from all .dox files
commit 3a7369d0cfa567cdb02063e1dad176c92ef2c7fe Author: Nick Mathewson Date: Fri Nov 15 09:23:51 2019 -0500 Doxygen: remove /** and **/ from all .dox files This is an automatically generated commit, made with: find src -name '*.dox' | \ xargs perl -i -ne 'print unless (m#^\s*/?\*\*/?\s*$#);' --- src/app/app.dox | 2 -- src/app/config/app_config.dox | 2 -- src/app/main/app_main.dox | 2 -- src/core/core.dox | 2 -- src/core/crypto/core_crypto.dox | 2 -- src/core/mainloop/core_mainloop.dox | 2 -- src/core/or/core_or.dox | 2 -- src/core/or/dataflow.dox | 2 -- src/core/proto/core_proto.dox | 2 -- src/feature/api/feature_api.dox | 2 -- src/feature/client/feature_client.dox | 2 -- src/feature/control/feature_control.dox | 2 -- src/feature/dirauth/feature_dirauth.dox | 2 -- src/feature/dircache/feature_dircache.dox | 2 -- src/feature/dirclient/feature_dirclient.dox | 2 -- src/feature/dircommon/feature_dircommon.dox | 2 -- src/feature/dirparse/feature_dirparse.dox | 2 -- src/feature/feature.dox | 2 -- src/feature/hibernate/feature_hibernate.dox | 2 -- src/feature/hs/feature_hs.dox | 2 -- src/feature/hs_common/feature_hs_common.dox | 2 -- src/feature/keymgt/feature_keymgt.dox | 2 -- src/feature/nodelist/feature_nodelist.dox | 2 -- src/feature/relay/feature_relay.dox | 2 -- src/feature/rend/feature_rend.dox | 2 -- src/feature/stats/feature_stats.dox | 2 -- src/lib/arch/lib_arch.dox | 2 -- src/lib/buf/lib_buf.dox | 2 -- src/lib/cc/lib_cc.dox | 2 -- src/lib/compress/lib_compress.dox | 2 -- src/lib/conf/lib_conf.dox | 2 -- src/lib/confmgt/lib_confmgt.dox | 2 -- src/lib/container/lib_container.dox | 2 -- src/lib/crypt_ops/certs.dox | 2 -- src/lib/crypt_ops/lib_crypt_ops.dox | 2 -- src/lib/ctime/lib_ctime.dox | 2 -- src/lib/defs/lib_defs.dox | 2 -- src/lib/dispatch/lib_dispatch.dox | 2 -- src/lib/encoding/lib_encoding.dox | 2 -- src/lib/err/lib_err.dox | 2 -- src/lib/evloop/lib_evloop.dox | 2 -- src/lib/evloop/time_periodic.dox | 2 -- src/lib/fdio/lib_fdio.dox | 2 -- src/lib/fs/lib_fs.dox | 2 -- src/lib/geoip/lib_geoip.dox | 2 -- src/lib/intmath/lib_intmath.dox | 2 -- src/lib/lib.dox | 2 -- src/lib/lock/lib_lock.dox | 2 -- src/lib/log/lib_log.dox | 2 -- src/lib/malloc/lib_malloc.dox | 2 -- src/lib/math/lib_math.dox | 2 -- src/lib/memarea/lib_memarea.dox | 2 -- src/lib/meminfo/lib_meminfo.dox | 2 -- src/lib/net/lib_net.dox | 2 -- src/lib/osinfo/lib_osinfo.dox | 2 -- src/lib/process/lib_process.dox | 2 -- src/lib/pubsub/lib_pubsub.dox | 2 -- src/lib/sandbox/lib_sandbox.dox | 2 -- src/lib/smartlist_core/lib_smartlist_core.dox | 2 -- src/lib/string/lib_string.dox | 2 -- src/lib/string/strings.dox| 1 - src/lib/subsys/initialization.dox | 2 -- src/lib/subsys/lib_subsys.dox | 2 -- src/lib/term/lib_term.dox | 2 -- src/lib/testsupport/lib_testsupport.dox | 2 -- src/lib/thread/lib_thread.dox | 2 -- src/lib/thread/threading.dox | 2 -- src/lib/time/lib_time.dox | 2 -- src/lib/tls/lib_tls.dox | 2 -- src/lib/trace/lib_trace.dox | 2 -- src/lib/version/lib_version.dox | 2 -- src/lib/wallclock/lib_wallclock.dox | 2 -- src/mainpage.dox | 4 src/tools/tools.dox | 2 -- 74 files changed, 149 deletions(-) diff --git a/src/app/app.dox b/src/app/app.dox index 21d5791cd..138e75b12 100644 --- a/src/app/app.dox +++ b/src/app/app.dox @@ -1,8 +1,6 @@ -/** @dir /app @brief app: top-level entry point for Tor The "app" directory has Tor's main entry point and configuration logic, and is responsible for initializing and managing the other modules in Tor. -**/ diff --git a/src/app/config/app_config.dox b/src/app/config/app_config.dox index ef4a87827..b359ce77f 100644 --- a/src/app/config/app_config.dox +++ b/src/app/config/app_config.dox @@ -1,8 +1,6 @@ -/** @dir /app/config @brief app/config: Top-level configuration code Refac
[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
commit ad46c0aef22521c41044927d7865d966f038c954 Author: Translation commit bot Date: Fri Nov 15 21:15:40 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index 1ea1c6d40..c49da9ad2 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -1231,8 +1231,8 @@ msgstr "" "Tor: Strength in Numbers (Birlikten Kuvvet DoÄar) yanında Tor: Powering the " "Digital Resistance (Sayısal DireniÅe Katıl), Open Observatory of Network " "Interference (OONI) (Açık AÄ Ä°zleme Gözlemevi) ya da Tor at the Heart of " -"Internet Freedom (Tor Ä°nternet ÃzgürlüÄünün Kalbi) tiÅörtü seçeneklerinden " -"birisi ile." +"Internet Freedom (Tor Ä°nternet ÃzgürlüÄünün Kalbinde) tiÅörtü " +"seçeneklerinden birisi ile." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:294 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:253 @@ -1260,7 +1260,7 @@ msgid "" "Tor at the Heart of Internet, Powering Digital Resistance or Open " "Observvatory of Network Interference (OONI) T-Shirt" msgstr "" -"Tor at the Heart of Internet (Tor Ä°nternet ÃzgürlüÄünün Kalbi), Powering " +"Tor at the Heart of Internet (Tor Ä°nternet ÃzgürlüÄünün Kalbinde), Powering " "Digital Resistance (Sayısal DireniÅe Katıl) ya da Open Observvatory of " "Network Interference (OONI) (Açık AÄ Ä°zleme Gözlemevi) tiÅörtü" @@ -1282,8 +1282,8 @@ msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor robust and secure." msgstr "" -"Evrensel insan hakları olan kiÅisel gizlilik ve özgürlük için destek olarak " -"Tor aÄının saÄlam ve güvende kalmasına yardımcı olun." +"Evrensel insan hakları olan kiÅisel gizlilik ve özgürlük için destek vererek" +" Tor aÄının saÄlam ve güvende kalmasına yardımcı olun." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:621 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 129d8f0c040d172431acb4149dfa62e59414059d Author: Translation commit bot Date: Fri Nov 15 20:53:19 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 33 ++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/contents+it.po b/contents+it.po index 1543ee49d..8af5b01f8 100644 --- a/contents+it.po +++ b/contents+it.po @@ -13,8 +13,8 @@ # Davide Sant , 2019 # SebastianoPistore , 2019 # Giandomenico Lombardi , 2019 -# Luke <94lukecatell...@gmail.com>, 2019 # Emma Peel, 2019 +# Luke <94lukecatell...@gmail.com>, 2019 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Luke <94lukecatell...@gmail.com>, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8159,6 +8159,12 @@ msgid "" "[traffic](#traffic) and hide it by bouncing through a series of computers " "around the world." msgstr "" +"[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" +" è un'[applicazione](#app) gratuita del The Guardian Project che consente ad" +" altre applicazioni sul tuo dispositivo di utilizzare internet in maniera " +"più sicura. Orbot usa [Tor](#tor-/-tor-network/-core-tor) per " +"[cifrare](#encryption) il tuo [traffico](#traffic) Internet e nasconderlo " +"facendolo rimbalzare attraverso una serie di computer in tutto il mondo." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8168,7 +8174,7 @@ msgstr "### Orfox" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "Orfox is no longer maintained or supported." -msgstr "" +msgstr "Orfox non è più mantenuto o supportato. " #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8177,6 +8183,10 @@ msgid "" "Browser for Android](https://www.torproject.org/download/#android) " "[app](#app) developed by the Tor Project." msgstr "" +"Per navigare il web utilizzando Tor su Android, si prega di utilizzare " +"l'[applicazione](#app) supportata [Tor Browser per " +"Android](https://www.torproject.org/download/#android) sviluppata dal Tor " +"Project. " #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8204,6 +8214,9 @@ msgid "" ")](#internet-service-provider-isp) or other authority is actively blocking " "connections to the [Tor network](#tor-/-tor-network/-core-tor)." msgstr "" +"Ciò può essere utile in situazioni in cui un [Internet Service Provider (ISP" +")](#internet-service-provider-isp) o un'altra autorità stia bloccando " +"attivamente le connessione alla [rete Tor](#tor-/-tor-network/-core-tor)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8237,6 +8250,8 @@ msgid "" "A proxy is a middle man between a [client](#client) (like a [web browser" "](#web-browser)) and a service (like a [web server](#server))." msgstr "" +"Un proxy è un intermediario tra un [client](#client) (come un [browser web" +"](#web-browser)) e un servizio (come un [server web](#server))." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8246,6 +8261,9 @@ msgid "" "the response back to the client. The service only communicates with and sees" " the proxy." msgstr "" +"Invece di connettersi direttamente al servizio, un client invia il messaggio" +" al proxy. Il proxy effettua la richiesta per conto del client e restituisce" +" la risposta al client. Il servizio vede e comunica solamente con il proxy." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8283,6 +8301,9 @@ msgid "" "The [public key](#public-key) can be disseminated widely while its belonging" " [private key](#private-key) is known only by the owner of the key pair." msgstr "" +"La [chiave pubblica](#public-key) può essere ampiamente diffusa mentre la " +"sua corrispondente [chiave privata](#private-key) è nota solamente al " +"proprietario della coppia di chiavi." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8291,6 +8312,9 @@ msgid "" "receiver but only the receiver in possession of the private key is able to " "decrypt the message." msgstr "" +"Ogni persona può [cifrare](#encryption) un messaggio utilizzando la chiave " +"pubblica del destinatario, ma solo il destinatario in possesso della chiave " +"privata può decifrare il messaggio." #: https//support.torproject.org/misc
[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
commit c75af41c1c34af4bd141b93f27305920b591e595 Author: Translation commit bot Date: Fri Nov 15 20:45:42 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index 540f08a4d..1ea1c6d40 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -9,13 +9,13 @@ # Taha KaradoÄan , 2019 # erinm, 2019 # Arda Büyükkaya , 2019 -# Kaya Zeren , 2019 # T. E. Kalayci , 2019 # Alperen Kitapçı , 2019 +# Kaya Zeren , 2019 # msgid "" msgstr "" -"Last-Translator: Alperen Kitapçı , 2019\n" +"Last-Translator: Kaya Zeren , 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -962,7 +962,7 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to DONATE?" -msgstr "" +msgstr "nasıl BAÄIÅ YAPMAK istersiniz?" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:300 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:336 @@ -2835,7 +2835,7 @@ msgstr "" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453 msgid "Gift Selected" -msgstr "Hediye Seçildi" +msgstr "SeçilmiÅ Hediye" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:83 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit 0f4f212408d0203a24ee1a2ed423739bcfc386a2 Author: Translation commit bot Date: Fri Nov 15 20:22:49 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+tr.po | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index d9b96bdb9..5f2a3df57 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -6,8 +6,8 @@ # IDRASSI Mounir , 2019 # ErdoÄan Åahin, 2019 # Emma Peel, 2019 -# Kaya Zeren , 2019 # dersteppenwolfx, 2019 +# Kaya Zeren , 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" -"Last-Translator: dersteppenwolfx, 2019\n" +"Last-Translator: Kaya Zeren , 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +152,7 @@ msgstr "Åimdi BaÄıŠYapın" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "Ticari Marka" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" @@ -418,12 +418,13 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# Genel Ticari Marka ve Telif Hakkı Beyanı" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "Content on this site is Copyright The Tor Project, Inc.." msgstr "" +"Bu sitenin içeriÄinin telif hakları Tor Project, Inc. kuruluÅuna aittir." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -431,6 +432,9 @@ msgid "" "Reproduction of content is permitted under a [Creative Commons Attribution " "3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/)." msgstr "" +"İçerik [Creative Commons Attribution 3.0 United States " +"License](https://creativecommons.org/licenses/by/3.0/us/) koÅulları altında " +"yeniden kullanılabilir." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -439,6 +443,9 @@ msgid "" "attribution that identifies The Tor Project, Inc. as the owner and " "originator of such content." msgstr "" +"Bu lisans koÅulları altındaki tüm kullanımlarda, The Tor Project, Inc. " +"kuruluÅunu bu içeriÄin sahibi ve kaynaÄı olarak tanımlayan açık ve belirgin " +"bir atıf bulunmalıdır." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -446,6 +453,8 @@ msgid "" "The Tor Project Inc. reserves the right to change licenses and permissions " "at any time in its sole discretion." msgstr "" +"Tor Project Inc., lisans ve izinleri kendi takdirine baÄlı olarak deÄiÅtirme" +" hakkını saklı tutar." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -454,6 +463,10 @@ msgid "" " " "licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." msgstr "" +"Tor® yazılımı çeÅitli Åekillerde lisanslanmıÅtır. Ayrıntılı bilgi almak için" +" [çeÅitli " +"lisanslar](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)" +" bölümüne bakabilirsiniz." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
commit b857ed16419b0de7cfd1d2e3d4c1e4ddf9a25f98 Author: Translation commit bot Date: Fri Nov 15 20:22:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+tr.po | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 18bee5b95..5f2a3df57 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -6,8 +6,8 @@ # IDRASSI Mounir , 2019 # ErdoÄan Åahin, 2019 # Emma Peel, 2019 -# Kaya Zeren , 2019 # dersteppenwolfx, 2019 +# Kaya Zeren , 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" -"Last-Translator: dersteppenwolfx, 2019\n" +"Last-Translator: Kaya Zeren , 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,11 +152,11 @@ msgstr "Åimdi BaÄıŠYapın" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "Ticari Marka" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" -msgstr "" +msgstr "Topluluk" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) @@ -418,12 +418,13 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# Genel Ticari Marka ve Telif Hakkı Beyanı" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "Content on this site is Copyright The Tor Project, Inc.." msgstr "" +"Bu sitenin içeriÄinin telif hakları Tor Project, Inc. kuruluÅuna aittir." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -431,6 +432,9 @@ msgid "" "Reproduction of content is permitted under a [Creative Commons Attribution " "3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/)." msgstr "" +"İçerik [Creative Commons Attribution 3.0 United States " +"License](https://creativecommons.org/licenses/by/3.0/us/) koÅulları altında " +"yeniden kullanılabilir." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -439,6 +443,9 @@ msgid "" "attribution that identifies The Tor Project, Inc. as the owner and " "originator of such content." msgstr "" +"Bu lisans koÅulları altındaki tüm kullanımlarda, The Tor Project, Inc. " +"kuruluÅunu bu içeriÄin sahibi ve kaynaÄı olarak tanımlayan açık ve belirgin " +"bir atıf bulunmalıdır." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -446,6 +453,8 @@ msgid "" "The Tor Project Inc. reserves the right to change licenses and permissions " "at any time in its sole discretion." msgstr "" +"Tor Project Inc., lisans ve izinleri kendi takdirine baÄlı olarak deÄiÅtirme" +" hakkını saklı tutar." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -454,6 +463,10 @@ msgid "" " " "licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." msgstr "" +"Tor® yazılımı çeÅitli Åekillerde lisanslanmıÅtır. Ayrıntılı bilgi almak için" +" [çeÅitli " +"lisanslar](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)" +" bölümüne bakabilirsiniz." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 3503fb96a6bfa03b9c8c67e67fdcad6dc6b0340b Author: Translation commit bot Date: Fri Nov 15 19:53:30 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contents+es.po b/contents+es.po index 5ca557137..976ea5f31 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6656,15 +6656,16 @@ msgid "" "service)), and never an exit node. You can view your current Tor circuit by " "clicking on the onion button in Tor Browser." msgstr "" -"Una ruta a través de [Tor network](#tor-/-tor-network/-core-tor) construida " -"por [clientes](#client) que consiste en nodos seleccionados aleatoriamente. " -"El circuito comienza tanto con un [puente](#puente) como un [guard](#guard)." -" La mayorÃa de los circuitos constan de tres nodos: una guardia o puente, un" -" [middle relay](#middle-relay), y un [exit](#exit). La mayorÃa de [onion " -"services](#onion-services) utilizan seis saltos en un circuito (with the " -"exception of [single onion services](#single-onion-service)), y nunca un " -"nodo de salida. Puedes ver tu circuito Tor actual haciendo clic en el botón " -"de la cebolla en el Navegador Tor." +"Una ruta a través de [la red Tor](#tor-/-tor-network/-core-tor) realizada " +"por los [clientes](#client) que consiste en nodos seleccionados " +"aleatoriamente. El circuito comienza tanto con un [puente](#puente) como un " +"[nodo guardia](#guard). La mayorÃa de los circuitos constan de tres nodos: " +"un guardia o puente, un [middle relay](#middle-relay), y un [nodo de " +"salida](#exit). La mayorÃa de los [servicios cebolla](#onion-services) " +"utilizan seis saltos en un circuito (con la excepción de los [single onion " +"services](#single-onion-service)), y nunca un nodo de salida. Puedes ver tu" +" circuito Tor actual haciendo clic en el botón de la cebolla en el Navegador" +" Tor." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 4ca9835b58ae539e9986ac3f24aab5298496b66d Author: Translation commit bot Date: Fri Nov 15 19:23:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index a1477ad3f..5ca557137 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6266,7 +6266,7 @@ msgstr "" #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "Learn how to connect to [OFTC servers](/get-in-touch/irc-help)." msgstr "" -"Aprende cómo conectarte a los [servidores OFTC](/get-in-touch/irc-help)." +"Aprende cómo conectarte a los [servidores OFTC](/es/get-in-touch/irc-help)." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -6571,7 +6571,7 @@ msgstr "" #: (content/misc/glossary/contents+en.lrquestion.description) msgid "[Tor Browser](#tor-browser) prevents fingerprinting." msgstr "" -"[Navegador Tor](#tor-browser) previene que se genere una huella digital " +"El [Navegador Tor](#tor-browser) impide que se genere una huella digital " "diferente para cada usuario." #: https//support.torproject.org/misc/glossary/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit ac0c8b7c895929b0944e15f90a77ca40adbd29a6 Author: Translation commit bot Date: Fri Nov 15 18:53:20 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+es.po b/contents+es.po index 6e3c9682d..a1477ad3f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3410,7 +3410,7 @@ msgid "" "Some options will have no effect as Tor Browser overrides them with command " "line options when it starts Tor." msgstr "" -"Algunas opciones no serán efectivas ya que el Navegador Tor las invalida " +"Algunas opciones no serán efectivas, ya que el Navegador Tor las invalida " "mediante opciones de la lÃnea de comandos cuando arranca Tor." #: https//support.torproject.org/tbb/tbb-editing-torrc/ @@ -3483,7 +3483,7 @@ msgid "" "specifically for Android. Installing Tor Browser for Android is all you need" " to run Tor on your Android device." msgstr "" -"Si, hay una versión del [Navegador " +"SÃ, hay una versión del [Navegador " "Tor](https://www.torproject.org/download/#android) especÃfica para Android. " "Lo único que necesitas para usar Tor en tu teléfono Android es instalar el " "Navegador Tor para Android." @@ -3793,9 +3793,9 @@ msgid "" "GetTor via Twitter is currently under maintenance. Please use the " "[email](https://support.torproject.org/gettor/gettor-2) instead." msgstr "" -"GetTor a través de Twitter se encuentra fuera de servicio. Por favor, " -"utilice el [correo " -"electrónico](https://support.torproject.org/gettor/gettor-2) en su lugar." +"GetTor a través de Twitter se encuentra fuera de servicio. Por favor, usa el" +" [correo electrónico](https://support.torproject.org/gettor/gettor-2) en su " +"lugar." #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.title) @@ -5326,9 +5326,9 @@ msgid "" "guide](https://community.torproject.org/relay/setup/bridge/) to learn how to" " set up an obfs4 bridge." msgstr "" -"Véa nuestra [guÃa para la configuración de " -"obfs4](https://community.torproject.org/relay/setup/bridge/) to learn how to" -" set up an obfs4 bridge." +"Lee nuestra [guÃa para la configuración de " +"obfs4](https://community.torproject.org/relay/setup/bridge/) para aprender " +"cómo se configura un puente obfs4." #: https//support.torproject.org/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title) @@ -5968,7 +5968,7 @@ msgid "" msgstr "" "Estos servicios usan el TLD (dominio de primer nivel) de uso especial .onion" " (en lugar de .com, .net, .org, etc.) y sólo son accesibles a través de la " -"red Sor." +"red Tor." #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -6103,7 +6103,7 @@ msgstr "- La página contiene elementos servidos mediante HTTP." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.title) msgid "How to Report a Bug or Give Feedback" -msgstr "Como informar de un error o darnos tu opinion" +msgstr "Como informar de un error o darnos tu opinión" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -6128,7 +6128,7 @@ msgid "" "When sending us feedback or reporting a bug, please include as many of these" " as possible:" msgstr "" -"Cuando nos envÃes tu opinión o informes de un error, haz el favor de incluÃr" +"Cuando nos envÃes tu opinión o informes de un error, haz el favor de incluir" " todo lo posible de la siguiente lista:" #: https//support.torproject.org/misc/bug-or-feedback/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [training/master] Add EN version of tor network slides
commit 87c1fd52dc096dfa5d1d4cc7147ad19ea95f9fa7 Author: gus Date: Fri Nov 15 13:29:05 2019 -0500 Add EN version of tor network slides --- 2019/tor-network/tor-network+en.odp | Bin 0 -> 661490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/tor-network/tor-network+en.odp b/2019/tor-network/tor-network+en.odp new file mode 100644 index 000..8138a62 Binary files /dev/null and b/2019/tor-network/tor-network+en.odp differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [training/master] Update All About Tor EN slides pack
commit a97d6362b4f253670129d55e678713ccf65d8328 Author: gus Date: Fri Nov 15 13:30:51 2019 -0500 Update All About Tor EN slides pack --- 2019/all-about-tor/all-about-tor-full-pack+en.odp | Bin 4235078 -> 4209248 bytes 2019/all-about-tor/all-about-tor-full-pack.odp| Bin 4235078 -> 4209248 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/all-about-tor/all-about-tor-full-pack+en.odp b/2019/all-about-tor/all-about-tor-full-pack+en.odp index 920d582..65430e7 100644 Binary files a/2019/all-about-tor/all-about-tor-full-pack+en.odp and b/2019/all-about-tor/all-about-tor-full-pack+en.odp differ diff --git a/2019/all-about-tor/all-about-tor-full-pack.odp b/2019/all-about-tor/all-about-tor-full-pack.odp index 920d582..65430e7 100644 Binary files a/2019/all-about-tor/all-about-tor-full-pack.odp and b/2019/all-about-tor/all-about-tor-full-pack.odp differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [training/master] Add slides Tor network 101
commit 701601272f325187a40553bf5791d0d965538a9b Author: gus Date: Fri Nov 15 13:25:24 2019 -0500 Add slides Tor network 101 --- 2019/tor-network/tor-network.odp | Bin 0 -> 661490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/tor-network/tor-network.odp b/2019/tor-network/tor-network.odp new file mode 100644 index 000..8138a62 Binary files /dev/null and b/2019/tor-network/tor-network.odp differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit 51c92fc787690b0d9b9d6b8f36ee41c552aed479 Author: Translation commit bot Date: Fri Nov 15 16:52:39 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ka.po | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 4ffbc0a6e..ac72b1385 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -148,7 +148,7 @@ msgstr "áááá¦áá áááá®á" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "á¡ááááá á ááá¨ááá" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" @@ -419,12 +419,12 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# áááááá ááá ááááá á¡ááááá á ááá¨ááááá¡á áá á¡áááá¢áá á á£á¤ááááááá¡" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "Content on this site is Copyright The Tor Project, Inc.." -msgstr "" +msgstr "áá á¡ááá¢áá áááªááá£áá ááá¡áááááá¡ áá¤ááááááá The Tor Project, Inc.." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -432,6 +432,9 @@ msgid "" "Reproduction of content is permitted under a [Creative Commons Attribution " "3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/)." msgstr "" +"á¨áááááá¡áá¡ áááááá£á¨ááááá áá¥áááááááá ááá [Creative Commons Attribution 3.0 " +"á¨ááá áááá£áá á¨á¢áá¢áááá¡ " +"áááªáááááá¡](https://creativecommons.org/licenses/by/3.0/us/)." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -440,6 +443,9 @@ msgid "" "attribution that identifies The Tor Project, Inc. as the owner and " "originator of such content." msgstr "" +"á§áááááááá ááááá§áááááá¡ áá áááªáááááá¡ á¥ááá¨, á£ááá áá®áááá¡ áááá¤áá áá á¡ááááááá " +"áááááááá, á¡ááá᪠The Tor Project, Inc. ááá®á¡áááááá£áá áá¥áááá á¨áá¡áááááá¡á " +"á¨áááááá¡áá¡ áá¤ááááááá áá ááá áááá¬á§áá áá." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -447,6 +453,8 @@ msgid "" "The Tor Project Inc. reserves the right to change licenses and permissions " "at any time in its sole discretion." msgstr "" +"The Tor Project Inc. áá¢ááááá¡ á£á¤ááááá¡ á¨ááªááááá¡ áááªáááááá¡á áá ááááá áááááá¡ " +"ááá ááááá ááááá¡áááá áá áá¡, áªáááá®á áááá." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -455,6 +463,9 @@ msgid "" " " "licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." msgstr "" +"The Tor® áá ááá ááá£áá á£áá á£ááááá§áá¤á áááªááááá ááá£ááá áá ááááá á¡áá®áá. áá®áááá áá áªááá" +" áá [á¡á®ááááá¡á®áá " +"áááªáááááááá](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 32509: Add comment explaining cbindgen vendoring
commit ead3b276006b68a7eecac3f29f09c1d4df76350c Author: Georg Koppen Date: Fri Nov 15 15:03:45 2019 + Bug 32509: Add comment explaining cbindgen vendoring --- projects/cbindgen/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 69014bf..ddfb9f9 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -11,5 +11,6 @@ input_files: - project: container-image - name: rust project: rust + # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. - URL: https://people.torproject.org/~boklm/mirrors/sources/cbindgen-vendor.tar.bz2 sha256sum: f4cde3d56df893b543b35b7e4a6e295a275dbb3cee8e8eae549efe679db50ab9 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 5145307e6dcaf745aebf52708c1ebc713752a36c Author: Translation commit bot Date: Fri Nov 15 14:45:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- vi/LC_MESSAGES/bridgedb.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index c3d95b44c..9363f865b 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-11-15 14:12+\n" +"PO-Revision-Date: 2019-11-15 14:22+\n" "Last-Translator: Äức Phạm Minh \n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -282,7 +282,7 @@ msgstr "Bridges laÌ giÌ?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridges %s laÌ nhÆ°Ìng sÆ°Ì£ ngÆ°ng trệ cuÌa Tor -Tor relays- nhÄÌm giuÌp traÌnh neÌ sÆ°Ì£ kiêÌm duyệt." +msgstr "%s Bridges %s laÌ nhÆ°Ìng sá»± tiếp ná»i của mạng Tor -Tor relays- nhÄÌm giuÌp traÌnh neÌ sÆ°Ì£ kiêÌm duyệt." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" @@ -307,11 +307,11 @@ msgstr "Bridges cuÌa tôi không hoaÌ£t Äộng! Tôi câÌn giuÌp ÄÆ¡Ì!" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "Nếu trình duyá»t Tor Browser của bạn không thá» kết ná»i, xin hãy xem xét %s và %s của chúng tôi." #: bridgedb/strings.py:123 msgid "Here are your bridge lines:" -msgstr "Bridge lines cuÌa baÌ£n Äây:" +msgstr "Cầu ná»i cuÌa baÌ£n Äây:" #: bridgedb/strings.py:124 msgid "Get Bridges!" @@ -319,7 +319,7 @@ msgstr "LâÌy Bridges!" #: bridgedb/strings.py:128 msgid "Please select options for bridge type:" -msgstr "HaÌy choÌ£n caÌc tuÌy choÌ£n cho bridge type:" +msgstr "HaÌy choÌ£n caÌc tuÌy choÌ£n cho loại cầu ná»i:" #: bridgedb/strings.py:129 msgid "Do you need IPv6 addresses?" @@ -356,14 +356,14 @@ msgstr "ÄÃªÌ nhập bridges vaÌo Tor Browser, ÄâÌu tiên Äi ÄêÌn %s t msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Khi hộp thoaÌ£i 'TuÌy chiÌnh Tor Network' xuâÌt hiện, bấm chuá»t vaÌo 'CâÌu hiÌnh' vaÌ laÌm theo\ntriÌnh hÆ°Æ¡Ìng dâÌn ÄêÌn khi noÌ hoÌi:" +msgstr "Khi hộp thoaÌ£i 'TuÌy chiÌnh mạng Tor' xuâÌt hiện, bấm chuá»t vaÌo 'CâÌu hiÌnh' vaÌ laÌm theo\ntriÌnh hÆ°Æ¡Ìng dâÌn ÄêÌn khi noÌ hoÌi:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:150 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "CoÌ phaÌi nhaÌ Cung CâÌp DiÌ£ch VuÌ£ Internet (ISP) cuÌa baÌ£n ÄaÌ khoÌa hoÄÌ£c kiêÌm duyệt caÌc kêÌt nôÌi ÄêÌn Tor network?" +msgstr "CoÌ phaÌi nhaÌ Cung CâÌp DiÌ£ch VuÌ£ Internet (ISP) cuÌa baÌ£n ÄaÌ khoÌa hoÄÌ£c kiêÌm duyệt caÌc kêÌt nôÌi ÄêÌn mạng Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:154 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit a0055a37e55bf8fb63db53da2471c2a953378249 Author: Translation commit bot Date: Fri Nov 15 14:15:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- vi/LC_MESSAGES/bridgedb.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index f1d6c544f..c3d95b44c 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # Acooldude, 2016 +# Äức Phạm Minh , 2019 # Khanh Nguyen , 2015-2016 # Gary, 2016 # Ngo Long , 2018 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 01:44+\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-11-15 14:12+\n" +"Last-Translator: Äức Phạm Minh \n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -293,7 +294,7 @@ msgid "" "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 "" +msgstr "CaÌch khaÌc ÄÃªÌ lâÌy bridges laÌ gÆ°Ìi một email tÆ¡Ìi %s. HaÌy lÆ°u yÌ rÄÌng baÌ£n phaÌi gÆ°Ìi một email\nsÆ°Ì duÌ£ng ÄiÌa chiÌ tÆ°Ì một trong nhÆ°Ìng nhaÌ cung câÌp email sau:\n%s hoÄÌ£c %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Not const.
commit 2d508f8fa56e180428337750788a155579ba84c8 Author: Nick Mathewson Date: Sun Nov 10 16:14:38 2019 -0500 Not const. --- src/lib/subsys/initialization.dox | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/subsys/initialization.dox b/src/lib/subsys/initialization.dox index 3b500f962..ed2d5abf2 100644 --- a/src/lib/subsys/initialization.dox +++ b/src/lib/subsys/initialization.dox @@ -55,7 +55,7 @@ In simplest terms, a **subsytem** is a logically separate part of Tor that can be initialized, shut down, managed, and configured somewhat independently of the rest of the program. -To define a subsystem, we declare a `static const` instance of subsys_fns_t, +To define a subsystem, we declare a `const` instance of subsys_fns_t, describing the subsystem and a set of functions that initialize it, deconstruct it, and so on. See the documentation for subsys_fns_t for a full list of these functions. @@ -73,4 +73,5 @@ must occur _after_ the initialization process, during configuration. + **/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Initialization documents: incorporate feedback from review.
commit 8746fedce4a440cccde2b4683d7aa72e7c0b0c89
Author: Nick Mathewson
Date: Fri Nov 15 09:00:54 2019 -0500
Initialization documents: incorporate feedback from review.
(Thanks, Taylor!)
---
src/lib/subsys/initialization.dox | 18 +-
src/lib/subsys/subsys.h | 9 +
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/lib/subsys/initialization.dox
b/src/lib/subsys/initialization.dox
index ed2d5abf2..561cd17ba 100644
--- a/src/lib/subsys/initialization.dox
+++ b/src/lib/subsys/initialization.dox
@@ -9,7 +9,7 @@
Tor has a single entry point: tor_run_main() in main.c. All the ways of
starting a Tor process (ntmain.c, tor_main.c, and tor_api.c) work by invoking
tor_run_main().
-The tor_run_main() function normally exits (\ref init_exceptwhen "1") by
+The tor_run_main() function normally exits (@ref init_exceptwhen "1") by
returning: not by calling abort() or exit(). Before it returns, it calls
tor_cleanup() in shutdown.c.
@@ -17,7 +17,7 @@ Conceptually, there are several stages in running Tor.
1. First, we initialize those modules that do not depend on the
configuration. This happens in the first half of tor_run_main(), and the
- first half of tor_init(). (\ref init_pending_refactor "2")
+ first half of tor_init(). (@ref init_pending_refactor "2")
2. Second, we parse the command line and our configuration, and configure
systems that depend on our configuration or state. This configuration
@@ -33,16 +33,16 @@ Conceptually, there are several stages in running Tor.
running.
-> \anchor init_exceptwhen 1. tor_run_main() _can_ terminate with a call to
+> @anchor init_exceptwhen 1. tor_run_main() _can_ terminate with a call to
> abort() or exit(), but only when crashing due to a bug, or when forking to
> run as a daemon.
-> \anchor init_pending_refactor 2. The pieces of code that I'm describing as
+> @anchor init_pending_refactor 2. The pieces of code that I'm describing as
> "the first part of tor_init()" and so on deserve to be functions with their
> own name. I'd like to refactor them, but before I do so, there is some
> slight reorganization that needs to happen. Notably, the
> nt_service_parse_options() call ought logically to be later in our
-> initialization sequence. See \ticket{32447} for our refactoring progress.
+> initialization sequence. See @ticket{32447} for our refactoring progress.
@section subsys Subsystems and initialization
@@ -55,10 +55,10 @@ In simplest terms, a **subsytem** is a logically separate
part of Tor that
can be initialized, shut down, managed, and configured somewhat independently
of the rest of the program.
-To define a subsystem, we declare a `const` instance of subsys_fns_t,
-describing the subsystem and a set of functions that initialize it,
-deconstruct it, and so on. See the documentation for subsys_fns_t for a full
-list of these functions.
+The subsys_fns_t type describes a subsystem and a set of functions that
+initialize it, desconstruct it, and so on. To define a subsystem, we declare
+a `const` instance of subsys_fns_t. See the documentation for subsys_fns_t
+for a full list of these functions.
After defining a subsytem, it must be inserted in subsystem_list.c. At that
point, table-driven mechanisms in subsysmgr.c will invoke its functions when
diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h
index 258d060bb..324f4f294 100644
--- a/src/lib/subsys/subsys.h
+++ b/src/lib/subsys/subsys.h
@@ -23,10 +23,11 @@ struct config_format_t;
* All callbacks are optional -- if a callback is set to NULL, the subsystem
* manager will treat it as a no-op.
*
- * You should use c99 named-field initializers with this structure: we
- * will be adding more fields, often in the middle of the structure.
+ * You should use c99 named-field initializers with this structure, for
+ * readability and safety. (There are a lot of functions here, all of them
+ * optional, and many of them with similar signatures.)
*
- * See \ref initialization for more information about initialization and
+ * See @ref initialization for more information about initialization and
* shutdown in Tor.
*
* To make a new subsystem, you declare a const instance of this type, and
@@ -71,7 +72,7 @@ typedef struct subsys_fns_t {
/**
* Connect a subsystem to the message dispatch system.
*
- * This function should use the macros in \refdir{lib/pubsub} to register a
+ * This function should use the macros in @refdir{lib/pubsub} to register a
* set of messages that this subsystem may publish, and may subscribe to.
*
* See pubsub_macros.h for more information, and for examples.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'ticket32211'
commit 97b5ff2b1d6ec59aea66cc262cf2545c98eefc5b Merge: 7aaa4ae30 8746fedce Author: Nick Mathewson Date: Fri Nov 15 09:10:11 2019 -0500 Merge branch 'ticket32211' Doxyfile.in | 2 + src/lib/subsys/initialization.dox | 77 +++ src/lib/subsys/subsys.h | 63 ++-- src/mainpage.dox | 2 + 4 files changed, 140 insertions(+), 4 deletions(-) diff --cc src/mainpage.dox index 1da074951,575d8b7f4..e3b17cf16 --- a/src/mainpage.dox +++ b/src/mainpage.dox @@@ -30,16 -30,10 +30,18 @@@ Tor repository @subpage intro + @subpage initialization + @subpage dataflow +@subpage certificates + +@subpage threading + +@subpage strings + +@subpage time_periodic + **/ /** ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Improve subsys documentation; add initialization documentation.
commit a6d22d7fc2c5f5c868fda4ed1224216a16c25f84
Author: Nick Mathewson
Date: Sun Nov 10 16:11:40 2019 -0500
Improve subsys documentation; add initialization documentation.
---
src/lib/subsys/initialization.dox | 76 +++
src/lib/subsys/subsys.h | 58 --
src/mainpage.dox | 3 ++
3 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/src/lib/subsys/initialization.dox
b/src/lib/subsys/initialization.dox
new file mode 100644
index 0..3b500f962
--- /dev/null
+++ b/src/lib/subsys/initialization.dox
@@ -0,0 +1,76 @@
+/**
+
+@page initialization Initialization and shutdown
+
+@tableofcontents
+
+@section overview Overview
+
+Tor has a single entry point: tor_run_main() in main.c. All the ways of
+starting a Tor process (ntmain.c, tor_main.c, and tor_api.c) work by invoking
tor_run_main().
+
+The tor_run_main() function normally exits (\ref init_exceptwhen "1") by
+returning: not by calling abort() or exit(). Before it returns, it calls
+tor_cleanup() in shutdown.c.
+
+Conceptually, there are several stages in running Tor.
+
+1. First, we initialize those modules that do not depend on the
+ configuration. This happens in the first half of tor_run_main(), and the
+ first half of tor_init(). (\ref init_pending_refactor "2")
+
+2. Second, we parse the command line and our configuration, and configure
+ systems that depend on our configuration or state. This configuration
+ happens midway through tor_init(), which invokes
+ options_init_from_torrc(). We then initialize more systems from the
+ second half of tor_init().
+
+3. At this point we may exit early if we have been asked to do something
+ requiring no further initialization, like printing our version number or
+ creating a new signing key. Otherwise, we proceed to run_tor_main_loop(),
+ which initializes some network-specific parts of Tor, grabs some
+ daemon-only resources (like the data directory lock) and starts Tor itself
+ running.
+
+
+> \anchor init_exceptwhen 1. tor_run_main() _can_ terminate with a call to
+> abort() or exit(), but only when crashing due to a bug, or when forking to
+> run as a daemon.
+
+> \anchor init_pending_refactor 2. The pieces of code that I'm describing as
+> "the first part of tor_init()" and so on deserve to be functions with their
+> own name. I'd like to refactor them, but before I do so, there is some
+> slight reorganization that needs to happen. Notably, the
+> nt_service_parse_options() call ought logically to be later in our
+> initialization sequence. See \ticket{32447} for our refactoring progress.
+
+
+@section subsys Subsystems and initialization
+
+Our current convention is to use the subsystem mechanism to initialize and
+clean up pieces of Tor. The more recently updated pieces of Tor will use
+this mechanism. For examples, see e.g. time_sys.c or log_sys.c.
+
+In simplest terms, a **subsytem** is a logically separate part of Tor that
+can be initialized, shut down, managed, and configured somewhat independently
+of the rest of the program.
+
+To define a subsystem, we declare a `static const` instance of subsys_fns_t,
+describing the subsystem and a set of functions that initialize it,
+deconstruct it, and so on. See the documentation for subsys_fns_t for a full
+list of these functions.
+
+After defining a subsytem, it must be inserted in subsystem_list.c. At that
+point, table-driven mechanisms in subsysmgr.c will invoke its functions when
+appropriate.
+
+@subsection vsconfig Initialization versus configuration
+
+We note that the initialization phase of Tor occurs before any configuration
+is read from disk -- and therefore before any other files are read from
+disk. Therefore, any behavior that depends on Tor's configuration or state
+must occur _after_ the initialization process, during configuration.
+
+
+
+**/
diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h
index 29a90c049..258d060bb 100644
--- a/src/lib/subsys/subsys.h
+++ b/src/lib/subsys/subsys.h
@@ -25,6 +25,13 @@ struct config_format_t;
*
* You should use c99 named-field initializers with this structure: we
* will be adding more fields, often in the middle of the structure.
+ *
+ * See \ref initialization for more information about initialization and
+ * shutdown in Tor.
+ *
+ * To make a new subsystem, you declare a const instance of this type, and
+ * include it on the list in subsystem_list.c. The code that manages these
+ * subsystems is in subsysmgr.c.
**/
typedef struct subsys_fns_t {
/**
@@ -55,7 +62,7 @@ typedef struct subsys_fns_t {
* it is only for global state or pre-configuration state.
*
* (If you need to do any setup that depends on configuration, you'll need
- * to declare a configuration callback. (Not yet designed))
+ * to declare a configuration callback instead. (Not yet designed))
*
* This function MUST NOT have any parts that
[tor-commits] [tor/master] doxygen: add a command for linking to our bugtracker
commit baddb30889fd281962f014614a43f323b5df6ae6
Author: Nick Mathewson
Date: Sun Nov 10 15:49:45 2019 -0500
doxygen: add a command for linking to our bugtracker
---
Doxyfile.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Doxyfile.in b/Doxyfile.in
index a087012c7..2ede04447 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -258,6 +258,8 @@ ALIASES=
ALIASES += refdir{1}="\ref src/\1 \"\1\""
+ALIASES += ticket{1}="[ticket \1](https://bugs.torproject.org/\1)"
+
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
# will allow you to use the command class in the itcl::class meaning.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit c8fb42d3baf1d57aae8547919359f3000ab3df85 Author: Translation commit bot Date: Fri Nov 15 13:53:45 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index ffdcfd49f..6e3c9682d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6570,7 +6570,9 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "[Tor Browser](#tor-browser) prevents fingerprinting." -msgstr "[Navegador Tor](#tor-browser) previene la toma de huellas ." +msgstr "" +"[Navegador Tor](#tor-browser) previene que se genere una huella digital " +"diferente para cada usuario." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6585,7 +6587,7 @@ msgid "" msgstr "" "Un historial de navegación es un registro de las solicitudes realizadas " "durante el uso de un [navegador](#web-browser), e incluye información tal " -"como los sitios web visitados y cuándo." +"como qué sitios web se han visitado y cuándo." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 5461fbd14101e1406994c2d592b21bd75cc6346e Author: Translation commit bot Date: Fri Nov 15 13:23:38 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 591dca905..ffdcfd49f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6584,7 +6584,7 @@ msgid "" "](#web-browser), and includes information like websites visited and when." msgstr "" "Un historial de navegación es un registro de las solicitudes realizadas " -"durante el uso de un [web browser](#web-browser), e incluye información tal " +"durante el uso de un [navegador](#web-browser), e incluye información tal " "como los sitios web visitados y cuándo." #: https//support.torproject.org/misc/glossary/ @@ -7401,7 +7401,7 @@ msgid "" "the window, which allows you to control the [JavaScript](#javascript)that " "runs on individual web pages, or to block it entirely." msgstr "" -"[Navegador Tor](#tor-browser) incluye un [add-on](#add-on-extension-or-" +"El [Navegador Tor](#tor-browser) incluye un [add-on](#add-on-extension-or-" "plugin) llamado NoScript, al que se accede a través del icono \"S\" en la " "parte superior izquierda de la ventana, que te permite controlar el " "[JavaScript](#javascript) que se ejecuta en páginas web individuales, o " @@ -7942,7 +7942,7 @@ msgid "" msgstr "" "Una sesión se refiere a una conversación entre dos dispositivos que se " "comunican en una red. Usar [Navegador Tor](#tor-browser) significa que se " -"borraran los datos de tu sesión cuando cierres el [web browser](#web-" +"borrarán los datos de tu sesión cuando cierres el [web browser](#web-" "browser)." #: https//support.torproject.org/misc/glossary/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
commit db58e0975b8bee0cbe436dabb5c3b3aeef50209f Author: Translation commit bot Date: Fri Nov 15 13:23:06 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 91c366d3d..1c76c6291 100644 --- a/contents+es.po +++ b/contents+es.po @@ -152,11 +152,11 @@ msgstr "Dona Ahora" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "Marca registrada" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" -msgstr "" +msgstr "Comunidad" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] copy 0.4.2.4-rc changelog to master
commit 7aaa4ae3031aff2d84a24abb4522f77b91e4ea53 Author: Nick Mathewson Date: Fri Nov 15 08:14:43 2019 -0500 copy 0.4.2.4-rc changelog to master --- ChangeLog | 58 ++ 1 file changed, 58 insertions(+) diff --git a/ChangeLog b/ChangeLog index 594f11ff9..1f23fa1cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +Changes in version 0.4.2.4-rc - 2019-11-15 + Tor 0.4.2.4-rc is the first release candidate in its series. It fixes + several bugs from earlier versions, including a few that would result in + stack traces or incorrect behavior. + + o Minor features (build system): +- Make pkg-config use --prefix when cross-compiling, if + PKG_CONFIG_PATH is not set. Closes ticket 32191. + + o Minor features (geoip): +- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2 + Country database. Closes ticket 32440. + + o Minor bugfixes (client, onion service v3): +- Fix a BUG() assertion that occurs within a very small race window + between when a client intro circuit opens and when its descriptor + gets cleaned up from the cache. The circuit is now closed early, + which will trigger a re-fetch of the descriptor and continue the + connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (code quality): +- Fix "make check-includes" so it runs correctly on out-of-tree + builds. Fixes bug 31335; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (configuration): +- Log the option name when skipping an obsolete option. Fixes bug + 32295; bugfix on 0.4.2.1-alpha. + + o Minor bugfixes (crash): +- When running Tor with an option like --verify-config or + --dump-config that does not start the event loop, avoid crashing + if we try to exit early because of an error. Fixes bug 32407; + bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (directory): +- When checking if a directory connection is anonymous, test if the + circuit was marked for close before looking at its channel. This + avoids a BUG() stacktrace if the circuit was previously closed. + Fixes bug 31958; bugfix on 0.4.2.1-alpha. + + o Minor bugfixes (shellcheck): +- Fix minor shellcheck errors in the git-*.sh scripts. Fixes bug + 32402; bugfix on 0.4.2.1-alpha. +- Start checking most scripts for shellcheck errors again. Fixes bug + 32402; bugfix on 0.4.2.1-alpha. + + o Testing (continuous integration): +- Use Ubuntu Bionic images for our Travis CI builds, so we can get a + recent version of coccinelle. But leave chutney on Ubuntu Trusty, + until we can fix some Bionic permissions issues (see ticket + 32240). Related to ticket 31919. +- Install the mingw OpenSSL package in Appveyor. This makes sure + that the OpenSSL headers and libraries match in Tor's Appveyor + builds. (This bug was triggered by an Appveyor image update.) + Fixes bug 32449; bugfix on 0.3.5.6-rc. +- In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241. + + Changes in version 0.4.2.3-alpha - 2019-10-24 This release fixes several bugs from the previous alpha release, and from earlier versions of Tor. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit 7f43d24e077fa36ae3d488ad8173db572a10caad Merge: 6a490d303 6d81ca845 Author: Nick Mathewson Date: Fri Nov 15 08:06:50 2019 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] bump version to 0.4.2.4-rc-dev
commit 6d81ca845c0f99335f9620a537ebc86219b7e0c9
Author: Nick Mathewson
Date: Fri Nov 15 08:06:09 2019 -0500
bump version to 0.4.2.4-rc-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6d7e7f4fe..a5c7b5ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc])
+AC_INIT([tor],[0.4.2.4-rc-dev])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
[Approximate date when this software was released. (Updated when the
version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 1a533dffe..fb6799214 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.2.4-rc"
+!define VERSION "0.4.2.4-rc-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/";
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3d6a24ca5..2456ff8af 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.2.4-rc"
+#define VERSION "0.4.2.4-rc-dev"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] bump version to 0.4.2.4-rc-dev
commit 6d81ca845c0f99335f9620a537ebc86219b7e0c9
Author: Nick Mathewson
Date: Fri Nov 15 08:06:09 2019 -0500
bump version to 0.4.2.4-rc-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6d7e7f4fe..a5c7b5ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc])
+AC_INIT([tor],[0.4.2.4-rc-dev])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
[Approximate date when this software was released. (Updated when the
version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 1a533dffe..fb6799214 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.2.4-rc"
+!define VERSION "0.4.2.4-rc-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/";
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3d6a24ca5..2456ff8af 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.2.4-rc"
+#define VERSION "0.4.2.4-rc-dev"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] bump version to 0.4.2.4-rc-dev
commit 6d81ca845c0f99335f9620a537ebc86219b7e0c9
Author: Nick Mathewson
Date: Fri Nov 15 08:06:09 2019 -0500
bump version to 0.4.2.4-rc-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6d7e7f4fe..a5c7b5ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc])
+AC_INIT([tor],[0.4.2.4-rc-dev])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
[Approximate date when this software was released. (Updated when the
version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 1a533dffe..fb6799214 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.2.4-rc"
+!define VERSION "0.4.2.4-rc-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/";
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3d6a24ca5..2456ff8af 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.2.4-rc"
+#define VERSION "0.4.2.4-rc-dev"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.2'
commit 00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c Merge: 825f52784 6d81ca845 Author: Nick Mathewson Date: Fri Nov 15 08:06:36 2019 -0500 Merge branch 'maint-0.4.2' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] 0.4.2.4-rc is now released.
commit f1b3cdfd60edbe62a7427322d7347b5e797da32f Author: Nick Mathewson Date: Fri Nov 15 08:03:06 2019 -0500 0.4.2.4-rc is now released. --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 81eb10d..70ca689 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,5 +9,5 @@ version = 9.5a2 version = 0.4.1.6 [tor-alpha] -version = 0.4.2.3-alpha +version = 0.4.2.4-rc ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 21974f383bc7988ebde080feeac25726ec33460d Author: Translation commit bot Date: Fri Nov 15 12:53:17 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 01f298044..5c6ee58e9 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -5,9 +5,9 @@ # erinm, 2019 # Assumpta, 2019 # Marc Ripoll , 2019 -# Ecron , 2019 # jmontane, 2019 # Emma Peel, 2019 +# Ecron , 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Ecron , 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7846,7 +7846,7 @@ msgstr "Suport" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Community" -msgstr "" +msgstr "Comunitat" #: https//support.torproject.org/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit e35348c351aeb2e7c1831a899d47bf7addbd6631 Author: Translation commit bot Date: Fri Nov 15 12:52:45 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 80d08e067..1c4a3df37 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -5,8 +5,8 @@ # Marc Ripoll , 2019 # Assumpta, 2019 # erinm, 2019 -# Ecron , 2019 # Emma Peel, 2019 +# Ecron , 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Ecron , 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,11 +148,11 @@ msgstr "Feu una donació" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "Marca registrada" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" -msgstr "" +msgstr "Comunitat" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) @@ -418,7 +418,7 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# Comunicat oficial sobre la Marca registrada i els Drets d'autor" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 1a130da67b6befa067963791257de84cdc7b5895 Author: Translation commit bot Date: Fri Nov 15 12:49:55 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index f7751f6d5..a0cc21836 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -6,8 +6,8 @@ # Marc Ripoll , 2019 # Emma Peel, 2019 # jmontane, 2019 -# Ecron , 2019 # Adolfo Jayme-Barrientos, 2019 +# Ecron , 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-08 10:34+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Adolfo Jayme-Barrientos, 2019\n" +"Last-Translator: Ecron , 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Assistència" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Community" -msgstr "" +msgstr "Comunitat" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] pick a release date.
commit 6a490d3032fa8d368bb54bd479b61c2bcbd45c8f Author: Nick Mathewson Date: Fri Nov 15 07:25:12 2019 -0500 pick a release date. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cc97a3e28..1f23fa1cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.4.2.4-rc - 2019-11-?? +Changes in version 0.4.2.4-rc - 2019-11-15 Tor 0.4.2.4-rc is the first release candidate in its series. It fixes several bugs from earlier versions, including a few that would result in stack traces or incorrect behavior. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 65d0627ccf2db48e4d84fe0593928b31e7c25885 Author: Translation commit bot Date: Fri Nov 15 12:19:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index c34bc9a31..cec1ce7d2 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -3,10 +3,10 @@ # 323484, 2019 # h345u37g3 h345u37g3, 2019 # ç³ä¸æ¬ç¥ , 2019 -# Emma Peel, 2019 # erinm, 2019 # ue zaeco, 2019 # Songbo Gong , 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-08 10:34+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Songbo Gong , 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -362,7 +362,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" -msgstr "" +msgstr "###Jabber/XMPP (JITSI, COYIM, ETC.)ã§GetTorã使ç¨ãã:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 4ed5926343bf70fd59deaadda33cd16c285702d4 Author: Translation commit bot Date: Fri Nov 15 11:53:02 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index ec2f02d54..dd6ff54eb 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -4,7 +4,6 @@ # Andrey, 2019 # Sergey Leschina , 2019 # ТимÑÑ ÐагоÑÑÐºÐ¸Ñ , 2019 -# Emma Peel, 2019 # Legenden Rifk , 2019 # Vitaliy Grishenko, 2019 # Evgeny Malyshev , 2019 @@ -13,6 +12,7 @@ # solokot , 2019 # Sergey Smirnov , 2019 # ÐаÑÐ¸Ñ Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ , 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: ÐаÑÐ¸Ñ Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ , 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1127,6 +1127,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 918fe4b62587f6901bafe38e9a803aa96e568f7f Author: Translation commit bot Date: Fri Nov 15 11:24:03 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 1bc859b82..fe15f7ef8 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8340,7 +8340,7 @@ msgstr "تÙر" #: lego/templates/secure-connections.html:32 #: templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr " اÙبÙاÙات اÙت٠ÙÙ Ù٠أ٠تظÙر" #: lego/templates/secure-connections.html:37 #: templates/secure-connections.html:37 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
commit e19ab1be9d6d78d40040db35774b9c0a3bfd6e00 Author: Translation commit bot Date: Fri Nov 15 11:23:40 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+es.po| 57 --- contents+fr.po| 56 +++--- contents+pt-BR.po | 60 +- contents+tr.po| 59 + contents.pot | 66 --- 5 files changed, 280 insertions(+), 18 deletions(-) diff --git a/contents+es.po b/contents+es.po index 663bf01b7..91c366d3d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -9,13 +9,14 @@ # IDRASSI Mounir , 2019 # Carlos Guerra , 2019 # Zuhualime Akoochimoya, 2019 +# Nicolas Sera-Leyva , 2019 # Emma Peel, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-06 15:48+CET\n" +"POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -147,6 +148,16 @@ msgstr "Donar" msgid "Donate Now" msgstr "Dona Ahora" +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.title) +msgid "Trademark" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Community" +msgstr "" + #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) msgid "Success" @@ -408,6 +419,46 @@ msgstr "" "- [Miembros de la junta directiva y personal del Tor " "Project](https://www.torproject.org/es/about/people/)" +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "# General Statement of Trademark and Copyright" +msgstr "" + +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "Content on this site is Copyright The Tor Project, Inc.." +msgstr "" + +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "" +"Reproduction of content is permitted under a [Creative Commons Attribution " +"3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/)." +msgstr "" + +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "" +"All use under such license must be accompanied by a clear and prominent " +"attribution that identifies The Tor Project, Inc. as the owner and " +"originator of such content." +msgstr "" + +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "" +"The Tor Project Inc. reserves the right to change licenses and permissions " +"at any time in its sole discretion." +msgstr "" + +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.body) +msgid "" +"The Tor® software is licensed in various ways. Learn more about the [various" +" " +"licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." +msgstr "" + #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" @@ -785,9 +836,9 @@ msgid "Give today, and Mozilla will match your donation." msgstr "Dona hoy, y Mozilla igualará tu donación." #: lego/templates/footer.html:9 lego/templates/footer.html:18 -#: lego/templates/navbar.html:74 templates/footer.html:9 +#: lego/templates/navbar.html:79 templates/footer.html:9 #: templates/footer.html:18 templates/hero-home.html:13 -#: templates/navbar.html:74 +#: templates/navbar.html:79 msgid "Download Tor Browser" msgstr "Descargar Tor Browser" diff --git a/contents+fr.po b/contents+fr.po index 2af375877..84a2b0469 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-06 15:48+CET\n" +"POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" "Last-Translator: AO , 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" @@ -148,6 +148,16 @@ msgstr "Faire un don" msgid "Donate Now" msgstr "Faites un don maintenant" +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.title) +msgid "Trademark" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Community" +msgstr "" + #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) msgid "Success" @@ -421,6 +431,
[tor-commits] [tpo/master] correct spelling for Catalan. will-fix: trac#31600
commit 35bab6985809ad87d7af4bf86d3cf96a7cbf Author: emma peel Date: Fri Nov 15 12:07:47 2019 +0100 correct spelling for Catalan. will-fix: trac#31600 --- databags/download-alternatives-alpha.ini | 2 +- databags/download-alternatives.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 6615447..1badac9 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -8,7 +8,7 @@ language = عربÙØ© (ar) [ca] url = /ca/ -language = Catalá (ca) +language = Català (ca) [cs] url = /cs/ diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 2ccb7d4..8884704 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -8,7 +8,7 @@ language = عربÙØ© (ar) [ca] url = /ca/ -language = Catalá (ca) +language = Català (ca) [cs] url = /cs/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] add catalan
commit 8090435c722b3132c6b0e48e11adb7475bfd391e Author: emma peel Date: Fri Nov 15 11:46:24 2019 +0100 add catalan --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++ tpo.lektorproject | 5 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 986169b..39bb940 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = de,es,fr,is,it,ka,pt-BR,ru,tr,zh-CN +translations = ca,de,es,fr,is,it,ka,pt-BR,ru,tr,zh-CN i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 658328e..e8cde4f 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,6 +4,12 @@ order = order-last url = / language = English (en) +[ca] +direction = text-left +order = order-last +url = /ca/ +language = Català (ca) + [de] direction = text-left order = order-last diff --git a/tpo.lektorproject b/tpo.lektorproject index 8cf24ab..efcc167 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -10,6 +10,11 @@ primary = yes url_prefix = / locale = en +[alternatives.ca] +name = Català (ca) +url_prefix = /ca/ +locale = ca + [alternatives.de] name = Deutsch (de) url_prefix = /de/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] add more items from databags to translation
commit 2924ae43ea25c111b2afe4b284169640a9fa10d1 Author: emma peel Date: Fri Nov 15 11:18:34 2019 +0100 add more items from databags to translation --- content/menu/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/menu/contents.lr b/content/menu/contents.lr index 42d2091..9465ce4 100644 --- a/content/menu/contents.lr +++ b/content/menu/contents.lr @@ -15,3 +15,5 @@ Jobs Blog Donate Donate Now +Trademark +Community ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit e437667e67b2c7fa10c0c58313265d56b463e21b Author: Translation commit bot Date: Fri Nov 15 10:20:08 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 0de76f73b..096b0d75a 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -3,11 +3,11 @@ # Ahmed A. <66222...@gmail.com>, 2019 # Khaled Hosny, 2019 # erinm, 2019 -# Emma Peel, 2019 # Ahmed IB , 2019 # Ahmad Gharbeia , 2019 # ButterflyOfFire, 2019 # Megan DeBlois , 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-08 10:34+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Megan DeBlois , 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2215,7 +2215,7 @@ msgstr "تÙر" #: lego/templates/secure-connections.html:32 #: templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr " اÙبÙاÙات اÙت٠ÙÙ Ù٠أ٠تظÙر" #: lego/templates/secure-connections.html:37 #: templates/secure-connections.html:37 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 5c1dd66c34ac1fae4ccc6e7666da716d1a926fbf Author: Translation commit bot Date: Fri Nov 15 09:53:08 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+es.po b/contents+es.po index 709f8373c..591dca905 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3251,7 +3251,7 @@ msgid "" "not make you anonymous on the Internet." msgstr "" "A pesar de que el nombre puede indicar lo contrario, el \"modo incógnito\" y" -" las \"pestañas privadas\" no te hacen anónimo en internet." +" las \"pestañas privadas\" no te hacen anónimo en Internet." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3261,8 +3261,8 @@ msgid "" "activity or digital fingerprint online." msgstr "" "Estos modos borran la información de tu ordenador relativa a la sesión de " -"navegación recien terminada, pero no aplican ninguna medida para esconder tu" -" actividad o la huella que dejas en internet." +"navegación recién terminada, pero no aplican ninguna medida para esconder tu" +" actividad o la huella que dejas en Internet." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3282,7 +3282,7 @@ msgid "" "browsing session that's fully obfuscated from end-to-end." msgstr "" "El Navegador Tor ofrece todas las caracterÃsticas amnésicas de las " -"\"pestañas privadas\" a la vez que también oculta tu dirección IP, las " +"\"pestañas privadas\", a la vez que también oculta tu dirección IP, las " "páginas que visitas y detalles sobre tu dispositivo que podrÃan ser " "utilizados para trazar un perfil sobre tu actividad en la web, permitiendo " "una navegación realmente privada que es camuflada de principio a fin." @@ -3310,7 +3310,7 @@ msgstr "Se supone que tengo que \"editar mi torrc\". ¿Que significa esto?" msgid "" "WARNING: Do NOT follow random advice instructing you to edit your `torrc`!" msgstr "" -"PRECAUCIÃN: ¡NO sigas instrucciones de ningún desconocido que te diga como " +"PRECAUCIÃN: ¡NO sigas instrucciones de ningún desconocido que te diga cómo " "cambiar las opciones del archivo `torrc`!" #: https//support.torproject.org/tbb/tbb-editing-torrc/ @@ -3319,8 +3319,8 @@ msgid "" "Doing so can allow an attacker to compromise your security and anonymity " "through malicious configuration of your `torrc`." msgstr "" -"Ello podrÃa causar que un adversario diera al traste con tu seguridad y/o tu" -" anonimato mediante unos ajustes maliciosos en tu archivo `torrc`." +"Ello podrÃa causar que un adversario comprometa tu seguridad y/o tu " +"anonimato mediante unos ajustes maliciosos en tu archivo `torrc`." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3328,8 +3328,8 @@ msgid "" "Tor uses a text file called `torrc` that contains configuration instructions" " for how Tor should behave." msgstr "" -"Tor utiliza un archivo de texto llamado `torrc` que contiene las " -"instrucciones de configuración que marcan como ha de comportarse Tor." +"Tor usa un archivo de texto llamado `torrc` que contiene las instrucciones " +"de configuración que marcan cómo ha de comportarse Tor." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3337,7 +3337,7 @@ msgid "" "The default configuration should work fine for most Tor users (hence the " "warning above.)" msgstr "" -"La configuración por defecto deberÃa de funcionar bien para la mayorÃade " +"La configuración por defecto deberÃa funcionar bien para la mayorÃa de " "usuarios (de ahà la advertencia anterior)." #: https//support.torproject.org/tbb/tbb-editing-torrc/ @@ -3375,7 +3375,7 @@ msgid "" "* The `torrc` is in the Tor Browser Data directory at `~/Library/Application" " Support/TorBrowser-Data/Tor`." msgstr "" -"* El archivo `torrc`se encuentra el el directorio de datos del Navegador Tor" +"* El archivo `torrc`se encuentra en el directorio de datos del Navegador Tor" " en `~/Library/Application Support/TorBrowser-Data/Tor`." #: https//support.torproject.org/tbb/tbb-editing-torrc/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit cf61b3b461e1ed7ff32af6ea12619978fbafd6df Author: Translation commit bot Date: Fri Nov 15 08:53:07 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+es.po b/contents+es.po index 4b2691b43..709f8373c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -352,7 +352,7 @@ msgid "" "[NoScript](https://noscript.net) â and adding anything else could " "deanonymize you." msgstr "" -"El Navegador Tor ya trae instalado dos complementos - [HTTPS " +"El Navegador Tor ya trae dos complementos instalados - [HTTPS " "Everywhere](https://www.eff.org/https-everywhere) y " "[NoScript](https://noscript.net) - y añadir cualquier otra cosa podrÃa " "desanonimizarte." @@ -2908,9 +2908,9 @@ msgid "" " deter or block Tor use. The error message about an infected machine should " "clear up again after a short time." msgstr "" -"Hasta donde nosotros sabemos, Google no está haciendo nada intencionado para" -" obstaculizar el uso de Tor. El mensaje de error sobre ordenadores " -"infectados desaparece normalmente al cabo de poco tiempo." +"Según nuestra perspectiva, Google no está haciendo nada para obstaculizar " +"especÃficamente el uso de Tor. El mensaje de error sobre ordenadores " +"infectados desaparece por si mismo al cabo de un tiempo." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.title) @@ -3055,7 +3055,7 @@ msgid "" "[Firewalled](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)" " clients for how to restrict what ports your Tor will try to access." msgstr "" -"Si tus servidores proxy solo te permiten conectar a ciertos puertos, lee la " +"Si tus servidores proxy sólo te permiten conectar a ciertos puertos, lee la " "página [clientes detrás de un " "cortafuegos](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)" " para saber como restringir los puertos a los que Tor intentará conectarse." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 012bb067e360354be1f1952531fed952500a5d11 Author: Translation commit bot Date: Fri Nov 15 08:49:54 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 81 +- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/contents+es.po b/contents+es.po index e7819eb19..77dc7a24d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4,9 +4,9 @@ # David Figuera , 2019 # erinm, 2019 # eulalio barbero espinosa , 2019 -# Emma Peel, 2019 # Nicolas Sera-Leyva , 2019 # strel, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-08 10:34+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: strel, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -331,8 +331,8 @@ msgid "" "mirrors, either through [EFF](https://tor.eff.org), [Calyx " "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)." msgstr "" -"Si no eres capaz de descargar el Tor Browser del sitio web oficial del " -"Proyecto Tor, puedes tratar de descargarlo de uno de nuestros sitios espejo " +"Si no puedes descargar el Tor Browser del sitio web oficial del Proyecto " +"Tor, puedes tratar de descargarlo de uno de nuestros espejos (mirrors) " "oficiales, tanto a través de [EFF](https://tor.eff.org), como [Calyx " "Institute](https://tor.calyxinstitute.org) o [CCC](https://tor.ccc.de)." @@ -679,7 +679,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "### TIPOS DE TRANSPORTE INSERTABLE" +msgstr "### TIPOS DE TRANSPORTE CONECTABLE" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -687,8 +687,8 @@ msgid "" "Currently there are three pluggable transports available, but more are being" " developed." msgstr "" -"Actualmente, hay tres transportes conectables disponibles, pero más están " -"siendo desarrollados." +"Actualmente, hay tres transportes conectables disponibles, pero se están " +"dessarrollando más." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -729,7 +729,7 @@ msgid "" msgstr "" "obfs4 hace que el tráfico Tor luzca aleatorio, y también previene que los " "censores encuentren puentes mediante el escaneo de Internet. Los puentes " -"obfs4 es menos probable que se bloqueen que los antetiores puentes obfs3." +"obfs4 es menos probable que se bloqueen que los anteriores puentes obfs3." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -781,7 +781,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "### USAR TRANSPORTES INSERTABLES" +msgstr "### USAR TRANSPORTES CONECTABLES" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -807,7 +807,7 @@ msgid "" "'Connect' to save your settings." msgstr "" "Una vez que hayas seleccionado el transporte conectable que te gustarÃa " -"usar, cliqueá 'Conectar' para guardar tus ajustes." +"usar, haz clic en 'Conectar' para guardar tus ajustes." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -827,9 +827,9 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, and meek-azure." msgstr "" -"Si es la primera vez que intentas eludir una conexión bloqueada, has de " -"probar con los distintos transportes que hay disponibles: obfs4, snowflake y" -" meek-azure." +"Si es la primera vez que intentas usar una conexión censurada, has de probar" +" con los distintos transportes que hay disponibles: obfs4, snowflake y meek-" +"azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -838,7 +838,7 @@ msgid "" "need to enter bridge addresses manually." msgstr "" "Si pruebas todas estas opciones y no consigues conectar con ninguna de " -"ellas, necesitarás introducir direcciones de puentes de red manualmente. " +"ellas, necesitarás introducir direcciones de puentes de red manualmente." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -846,8 +846,8 @@ msgid "" "Read the [Bridges](/en-US/bridges/) section to learn what bridges are and " "how to obtain them." msgstr "" -"Lee la sección de [Puentes](/en-US/bridges/) para saber qué son los " -"repetidores puente y cómo obtenerlos." +"Lee la
