November 2019 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 07 Nov '19

07 Nov '19

commit 66b168526d6907fe6f139984e9f6f43245b4ca6a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 10:50:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ca.po | 60 ++++++++++++++++++++++++--------------------- contents+es.po | 6 ++++- contents+ja.po | 38 +++++++++++++++-------------- contents+tr.po | 62 +++++++++++++++++++++++----------------------- contents+zh-CN.po | 73 ++++++++++++++++++++++++++++--------------------------- 5 files changed, 125 insertions(+), 114 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 61615a33b..dfa187525 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -4,9 +4,9 @@ # Benny Beat <bennybeat(a)gmail.com>, 2019 # erinm, 2019 # Ecron <ecron_89(a)hotmail.com>, 2019 -# Emma Peel, 2019 # Assumpta, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-07 10:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Marc Ripoll <markripesp(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 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" @@ -202,7 +202,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### COM FUNCIONA TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -290,7 +290,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### MIRALLS" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -304,7 +304,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -320,7 +320,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### PER A UTILITZAR EL GETTOR PER CORREU ELECTRÒNIC:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -352,7 +352,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 "### PER A UTILITZAR EL GETTOR PER JABBER/XMPP (JITSI, COYIM, ETC.):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -507,7 +507,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "### CONECTA'T" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -540,7 +540,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### CONFIGURA" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -621,7 +621,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### TIPUS DE CONNECTORS DE TRANSPORT" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -718,7 +718,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "## UTILITZACIÓ DE CONNECTORS DE TRANSPORT" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -747,7 +747,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "### QUIN TIPUS DE TRANSPORT VOL UTILITZAR?" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -825,7 +825,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### OBTENCIÓ DE DIRECCIÓ PONT" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -980,7 +980,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### THE URL BAR" -msgstr "" +msgstr "### BARRA DE URL" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1107,7 +1107,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### CANVIANT IDENTITATS I CIRCUITS" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1124,7 +1124,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW IDENTITY" -msgstr "" +msgstr "### NOVA IDENTITAT" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1154,7 +1154,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### NOU CIRCUIT TOR PER A AQUEST LLOC" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1237,7 +1237,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### COM ACCEDIR A UN SERVEI CEBA" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1269,7 +1269,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### DETECCIÓ D'ERRORS" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1393,11 +1393,13 @@ msgid "" "<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" "anim.gif\">" msgstr "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"anim.gif\">" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### NIVELLS DE SEGURETAT" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1420,6 +1422,8 @@ msgid "" "<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" "safest.png\">" msgstr "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"safest.png\">" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1512,7 +1516,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### ACTUALITZACIÓ AUTOMÀTICA DEL NAVEGADOR TOR" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1541,7 +1545,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### ACTUALITZACIÓ MANUAL DEL NAVEGADOR TOR" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1591,7 +1595,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### CORRECCIONS RÀPIDES" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1650,7 +1654,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "### ESTÀ LA SEVA CONNEXIÓ EN CENSURA?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1663,7 +1667,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### ASSUMPTES CONEGUTS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1687,7 +1691,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### REPRODUCTOR FLASH" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1720,7 +1724,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JAVASCRIPT" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1759,7 +1763,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### BROWSER ADD-ONS" -msgstr "" +msgstr "### COMPLEMENTS" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) diff --git a/contents+es.po b/contents+es.po index 758698b55..d95db7c4c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -304,6 +304,10 @@ 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 " +"oficiales, tanto a través de [EFF](https://tor.eff.org), como [Calyx " +"Institute](https://tor.calyxinstitute.org) o [CCC](https://tor.ccc.de)." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -376,7 +380,7 @@ msgstr "Instalación" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.description) msgid "Installing Tor Browser" -msgstr "" +msgstr "Instalar el Navegador Tor" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) diff --git a/contents+ja.po b/contents+ja.po index 0d8129f5f..a513468a6 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -2,10 +2,10 @@ # Tokumei Nanashi, 2019 # ue zaeco, 2019 # erinm, 2019 -# Emma Peel, 2019 # 323484, 2019 # h345u37g3 h345u37g3, 2019 # 石上敬祐 <k.130.email(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-07 10:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: 石上敬祐 <k.130.email(a)gmail.com>, 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" @@ -198,7 +198,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "###Torの仕組み" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -278,7 +278,7 @@ msgstr "この場合、以下に示す代替のダウンロード手段を利用 #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "###ミラー" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -292,7 +292,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -462,7 +462,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser`" -msgstr "" +msgstr "`./start-tor-browser`" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -614,27 +614,27 @@ msgstr "<table class=\"table table-striped\">" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "<tbody>" -msgstr "" +msgstr "<tbody>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "<tr class=\"odd\">" -msgstr "" +msgstr "<tr class=\"odd\">" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "<td>" -msgstr "" +msgstr "<td>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "obfs4" -msgstr "" +msgstr "obfs4" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "</td>" -msgstr "" +msgstr "</td>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -647,7 +647,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "</tr>" -msgstr "" +msgstr "</tr>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -754,7 +754,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) msgid "BRIDGES" -msgstr "" +msgstr "ブリッジ" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.description) @@ -870,6 +870,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/tor-launcher-custom-bridges.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/tor-launcher-custom-bridges.png\">" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -904,7 +906,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "" +msgstr "識別子の管理" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description) @@ -1168,7 +1170,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### 問題の解決" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1282,7 +1284,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### セキュリティレベル" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1413,7 +1415,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" -msgstr "" +msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1451,7 +1453,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.title) msgid "TROUBLESHOOTING" -msgstr "" +msgstr "問題の解決" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.description) diff --git a/contents+tr.po b/contents+tr.po index 9c387cccd..c357c294d 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,10 +2,10 @@ # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2018 # Cenk Yıldızlı <goncagul(a)national.shitposting.agency>, 2019 # ilkeryus <ilkeryus(a)gmail.com>, 2019 -# Emma Peel, 2019 # Volkan Gezer <volkangezer(a)gmail.com>, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 # erinm, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-07 10:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Emma Peel, 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" @@ -204,7 +204,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### TOR NASIL ÇALIŞIR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -292,7 +292,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### YANSILAR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -306,7 +306,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -322,7 +322,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### E-POSTA İLE GETTOR KULLANIMI:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -354,7 +354,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, VB.) İLE GETTOR KULLANIMI:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -510,7 +510,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "## BAĞLANTI KURMAK" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -543,7 +543,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### YAPILANDIRMAK" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -632,7 +632,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### DEĞİŞTİRİLEBİLİR TAŞIYICI TÜRLERİ" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -730,7 +730,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "### DEĞİŞTİRİLEBİLİR TAŞIYICILARI KULLANMAK" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -759,7 +759,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "### HANGİ DEĞİŞTİRİLEBİLİR TAŞIYICIYI KULLANMALIYIM?" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -838,7 +838,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### KÖPRÜ ADRESLERİNİ ALMAK" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -904,7 +904,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "### KÖPRÜ ADRESLERİNİ YAZMAK" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -991,7 +991,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### THE URL BAR" -msgstr "" +msgstr "### ADRES ÇUBUĞU" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1060,7 +1060,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### LOGGING IN OVER TOR" -msgstr "" +msgstr "### TOR ÜZERİNDEN OTURUM AÇMAK" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1130,7 +1130,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### KİMLİK VE DEVRE DEĞİŞTİRMEK" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1147,7 +1147,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW IDENTITY" -msgstr "" +msgstr "### YENİ KİMLİK" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1177,7 +1177,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### BU SİTE İÇİN YENİ TOR DEVRESİ" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1273,7 +1273,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### BİR ONION HİZMETİNE NASIL ERİŞİLİR" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1304,7 +1304,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### SORUN ÇÖZME" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1418,7 +1418,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### GÜVENLİK AYARLARINA ERİŞMEK" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1450,7 +1450,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### GÜVENLİK DÜZEYLERİ" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1586,7 +1586,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### TOR BROWSER UYGULAMASINI OTOMATİK OLARAK GÜNCELLEMEK" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1615,7 +1615,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### TOR BROWSER UYGULAMASINI EL İLE GÜNCELLEMEK" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1669,7 +1669,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### HIZLI ÇÖZÜMLER" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1729,7 +1729,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "## BAĞLANTINIZ SANSÜRLENİYOR MU?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1745,7 +1745,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### BİLİNEN SORUNLAR" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1774,7 +1774,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### FLASH PLAYER" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1808,7 +1808,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JAVASCRIPT" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1854,7 +1854,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### BROWSER ADD-ONS" -msgstr "" +msgstr "### TARAYICI EKLENTİLERİ" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index d526e50fc..5e30ba4d9 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1,11 +1,10 @@ # Translators: -# 耀石徐 <xuyaoshix(a)gmail.com>, 2019 # ヨイツの賢狼ホロ, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 # erinm, 2019 -# Emma Peel, 2019 # ff98sha, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-07 10:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,7 +191,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### Tor 如何工作" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -269,7 +268,7 @@ msgstr "如果您遭遇到类似情况的话，可以利用下列几种不同的 #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### 镜像" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -283,7 +282,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GetTor" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -298,7 +297,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### 通过邮件使用GetTor：" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -327,7 +326,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等）使用GetTor：" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -453,7 +452,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser`" -msgstr "" +msgstr "`./start-tor-browser`" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -482,7 +481,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "### 连接" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -515,7 +514,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### 配置" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -592,7 +591,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### 可插拔传输类型" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -689,7 +688,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "### 使用可插拔传输" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -718,7 +717,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "### 我该使用哪种传输方式？" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -794,7 +793,7 @@ msgstr "其他可插拔传输层（例如 meek）使用不同的抗审查技术 #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### 获取网桥地址" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -859,7 +858,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "### 输入网桥地址" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -966,6 +965,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/circuit_full.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/circuit_full.png\">" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -992,7 +993,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### LOGGING IN OVER TOR" -msgstr "" +msgstr "### 使用 Tor 登录" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1045,7 +1046,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### 更改身份和链路" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1062,7 +1063,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW IDENTITY" -msgstr "" +msgstr "### 新的身份" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1088,7 +1089,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### 用于此网站的新 Tor 链路" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1167,7 +1168,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### 如何访问洋葱服务" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1194,7 +1195,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### 疑难解答" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1259,14 +1260,14 @@ msgstr "为安全和易用而配置 Tor 浏览器" msgid "" "By default, Tor Browser protects your security by encrypting your browsing " "data." -msgstr "在默认情况下，Tor 浏览器浏览器将加密你的浏览数据来保护你的安全性" +msgstr "在默认情况下，Tor 浏览器浏览器将加密你的浏览数据来保护你的安全性." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "" "You can further increase your security by choosing to disable certain web " "features that can be used to attack your security and anonymity." -msgstr "你可以禁用某些互联网功能来进一步提高安全性和匿名性" +msgstr "你可以禁用某些互联网功能来进一步提高安全性和匿名性." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1286,7 +1287,7 @@ msgstr "提升Tor 浏览器的安全级别会阻止一些网页的正常功能 #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### 访问安全设置" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1314,7 +1315,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### 安全级别" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1429,7 +1430,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### 自动更新 Tor 浏览器" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1446,7 +1447,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" -msgstr "" +msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1458,7 +1459,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### 手动更新 Tor 浏览器" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1503,7 +1504,7 @@ msgstr "理论上来说，当 Tor 浏览器启动后您应该可以直接开始 #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### 快速修复" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1550,7 +1551,7 @@ msgstr "* 移除掉 Tor 浏览器后再重新安装，若是要更新版本的 #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "### 您的连接是否受审查？" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1565,7 +1566,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### 已知问题" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1590,7 +1591,7 @@ msgstr "Tor 浏览器如何处理附加组件、插件和 JavaScript" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### Flash Player" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1618,7 +1619,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JavaScript" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1658,7 +1659,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### BROWSER ADD-ONS" -msgstr "" +msgstr "### 浏览器附加包" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -2137,7 +2138,7 @@ msgstr "" #: lego/templates/secure-connections.html:37 #: templates/secure-connections.html:37 msgid "Site.com" -msgstr "site.com" +msgstr "Site.com" #: lego/templates/secure-connections.html:40 #: templates/secure-connections.html:40

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 07 Nov '19

07 Nov '19

commit 4c8ced85710e4b75677a751d9e075c321afec496 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 10:46:52 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+nl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code_of_conduct+nl.po b/code_of_conduct+nl.po index 8f6892d4b..79fa84117 100644 --- a/code_of_conduct+nl.po +++ b/code_of_conduct+nl.po @@ -518,8 +518,7 @@ msgstr "als u vragen of zorgen hebt over de gedragscode, of" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:205 msgid "if you feel that you have witnessed a code of conduct violation" -msgstr "" -"als u denkt getuige te zijn van een een overtreding van de gedragscode" +msgstr "als u denkt getuige te zijn van een overtreding van de gedragscode" #. type: Plain text #: ../code_of_conduct.txt:212

1 0

[tor-browser-build/master] Pick up changes for build5
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit cc4d8a1a74c1def3c0921e59763d09864d72bc77 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 10:27:20 2019 +0000 Pick up changes for build5 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++-- rbm.conf | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 1af3014..8c26eb9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6240fdc..f8caf37 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.5a2 -- November 6 2019 +Tor Browser 9.5a2 -- November 8 2019 * All Platforms - * Update NoScript to 11.0.4 + * Update NoScript to 11.0.7 * Bug 21004: Don't block JavaScript on onion services on medium security * Bug 27307: NoScript marks HTTP onions as not secure * Bug 30783: Fundraising banner for EOY 2019 campain @@ -21,8 +21,17 @@ Tor Browser 9.5a2 -- November 6 2019 * Bug 32188: Fix localization on about:preferences#tor * Bug 32184: Red dot is shown while downloading an update * Bug 27604: Fix broken Tor Browser after moving it to a different directory + * Bug 32220: Improve the letterboxing experience + * Bug 30683: Backport upstreamed fix from Mozilla (bug 1581537) * Android * Bug 32342: Crash when changing the browser locale + * Bug 32303: Obfs4 is broken on Android Q + * Build System + * All Platforms + * Bug 32413: Bump Go version to 1.12.13 + * Bug 32053: Compile Rust code with -O1 to avoid reproducibility issues + * Android + * Bug 28803: Integrate building Pluggable Transports for Android Tor Browser 9.5a1 -- October 23 2019 * All Platforms diff --git a/rbm.conf b/rbm.conf index aaa6e3a..c6da42c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a2' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 9.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 32053: Work around Rust related reproducibility issues
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit f1f9fa0286982d1fa486880ad6037e1e7a46457d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 07:53:53 2019 +0000 Bug 32053: Work around Rust related reproducibility issues --- Cargo.toml | 2 +- build/moz.configure/toolchain.configure | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7a0ba6d7abad..cb317e882847 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ debug-assertions = true panic = "abort" [profile.release] -opt-level = 2 +opt-level = 1 rpath = false debug-assertions = false panic = "abort" diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3bcf403bceec..f5a6ea7b3bc3 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1876,8 +1876,8 @@ js_option(env='RUSTC_OPT_LEVEL', nargs=1, help='Rust compiler optimization level (-C opt-level=%s)') -# --enable-release kicks in full optimizations. -imply_option('RUSTC_OPT_LEVEL', '2', when='--enable-release') +# Use -O1 as a workaround for reproducibility issues for now, see #32053. +imply_option('RUSTC_OPT_LEVEL', '1', when='--enable-release') @depends('RUSTC_OPT_LEVEL', moz_optimize)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 07 Nov '19

07 Nov '19

commit 12b990b45f581fcbb49793a60812e310bd6a34af Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 10:22:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ka.po | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 0c33a8796..bbf482d91 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -226,6 +226,10 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"ჩვენ გვსურს, ყველას შეეძლოს Tor-ბრაუზერის საკუთარ ენაზე გამოყენება. Tor-" +"ბრაუზერი ახლა უკვე ხელმისაწვდომია 32 ენაზე და ვმუშაობთ კიდევ მეტის " +"დასამატებლად. გსურთ დაგვეხმაროთ თარგმნაში? [იხილეთ " +"ვრცლად](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -306,6 +310,9 @@ msgid "" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" +"Tor-პროექტი და მის გარშემო შეკრებული ერთობა ქმნის და ავრცელებს ისეთ ფართოდ " +"გამოყენებულ უფასო, ღია წყაროს მქონე, პირადი მონაცემების დაცვის საშუალებებს, " +"როგორიცაა: Tor-ბრაუზერი და Tor-ქსელი." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -1055,10 +1062,14 @@ msgid "" "infrastructure, please email tor-security(a)lists.torproject.org. If you've " "found a security bug in Tor or Tor Browser, feel free to submit it for our" msgstr "" +"თუ უსაფრთხოების რამე სისუსტე ნახეთ ჩვენს რომელიმე პროექტში ან " +"ინფრასტრუქტურაში, გთხოვთ მოგვწეროთ ელფოსტაზე tor-" +"security(a)lists.torproject.org. თუ უსაფრთხოების ხარვეზს გადააწყდით Tor-ში ან " +"Tor-ბრაუზერში, შეგიძლიათ წარადგინოთ ჩვენს" #: templates/contact.html:80 msgid "bug bounty program." -msgstr "" +msgstr "ხარვეზების აღმოჩენის წამახალისებელ პროგრამაში." #: templates/contact.html:80 msgid "" @@ -1218,6 +1229,8 @@ msgid "" "Tor Browser will block browser plugins such as Flash, RealPlayer, QuickTime," " and others: they can be manipulated into revealing your IP address." msgstr "" +"Tor-ბრაუზერი ზღუდავს მოდულებს, როგორიცაა Flash, RealPlayer, QuickTime და " +"სხვები: მათი მეშვეობით თქვენი IP-მისამართის დადგენაა შესაძლებელი." #: templates/download.html:27 msgid "" @@ -1347,6 +1360,9 @@ msgid "" "Tor Browser aims to make all users look the same, making it difficult for " "you to be fingerprinted based on your browser and device information." msgstr "" +"Tor-ბრაუზერი უზრუნველყოფს, რომ ყველა მომხმარებელი გამოიყურებოდეს ერთნაირად " +"და შეუძლებელი იყოს მათი ერთმანეთისგან გამორჩევა პროგრამის ან მოწყობილობის " +"მონაცემების მეშვეობით." #: templates/home.html:58 msgid "Multi-layered Encryption"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 07 Nov '19

07 Nov '19

commit 75e0e7cc142f2b44e21d86d9f32302708d5e4f93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 10:20:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 122 +++++++++++++++++++++++++++++++++++++++++---------------- contents+fa.po | 32 ++++++++------- 2 files changed, 105 insertions(+), 49 deletions(-) diff --git a/contents+es.po b/contents+es.po index 7d97059de..758698b55 100644 --- a/contents+es.po +++ b/contents+es.po @@ -294,7 +294,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### ESPEJOS" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -308,7 +308,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -324,7 +324,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### USAR GETTOR VÍA CORREO ELECTRÓNICO:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -357,7 +357,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 "### USAR GETTOR VÍA JABBER/XMPP (JITSI, COYIM, ETC.):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -371,7 +371,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.title) msgid "INSTALLATION" -msgstr "" +msgstr "Instalación" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.description) @@ -383,7 +383,7 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "For Windows:" -msgstr "" +msgstr "En Windows:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -416,7 +416,7 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "For macOS:" -msgstr "" +msgstr "En macOS:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -435,7 +435,7 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "For GNU/Linux:" -msgstr "" +msgstr "En GNU/Linux:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -483,7 +483,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser`" -msgstr "" +msgstr "`./start-tor-browser`" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -501,6 +501,8 @@ msgid "" "When you run Tor Browser for the first time, you will see the Tor Network " "Settings window." msgstr "" +"Cuando ejecutes Tor Browser por primera vez verás la ventana de " +"Configuración de la Red Tor." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -508,11 +510,13 @@ msgid "" "This offers you the option to connect directly to the Tor network, or to " "configure Tor Browser for your connection." msgstr "" +"Esta te ofrece la opción de conectar directamente a la red Tor, o de " +"configurar el Tor Browser para tu conexión." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "### CONECTAR" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -527,12 +531,16 @@ msgid "" "In most cases, choosing \"Connect\" will allow you to connect to the Tor " "network without any further configuration." msgstr "" +"En la mayoría de los casos escoger \"Conectar\" te permitirá conectar a la " +"red Tor sin ninguna configuración adicional." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "" "Once clicked, a status bar will appear, showing Tor’s connection progress." msgstr "" +"Una vez hagas clic aparecerá una barra de estado mostrando el progreso de la" +" conexión de Tor." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -541,11 +549,15 @@ msgid "" "at a certain point, see the [Troubleshooting](/troubleshooting) page for " "help solving the problem." msgstr "" +"Si tienes una conexión relativamente rápida pero la barra parece haberse " +"quedado fija en un determinado punto, lee la página [Solución de " +"problemas](/es/troubleshooting) para obtener ayuda para solucionar el " +"problema." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### CONFIGURAR" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -621,6 +633,8 @@ msgid "" "Direct access to the Tor network may sometimes be blocked by your Internet " "Service Provider or by a government." msgstr "" +"El acceso directo a la red Tor a veces puede estar bloqueado por tu " +"Proveedor de Servicios de Internet (ISP) o por un gobierno." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -628,11 +642,13 @@ msgid "" "Tor Browser includes some circumvention tools for getting around these " "blocks. These tools are called “pluggable transports”." msgstr "" +"El Navegador Tor incluye algunas herramientas de evasión para evitar estos " +"bloqueos. Estas herramientas se llaman \"transportes conectables\"." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### TIPOS DE TRANSPORTE INSERTABLE" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -640,6 +656,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." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -678,6 +696,9 @@ msgid "" "bridges by Internet scanning. obfs4 bridges are less likely to be blocked " "than its predecessor, obfs3 bridges." 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." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -729,7 +750,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "### USAR TRANSPORTES INSERTABLES" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -754,11 +775,13 @@ msgid "" "Once you've selected the pluggable transport you'd like to use, click " "'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." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "### ¿QUÉ TRANSPORTE DEBERÍA USAR?" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -773,6 +796,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." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -780,6 +806,8 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "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. " #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -787,6 +815,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." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) @@ -799,6 +829,8 @@ msgid "" "Most Pluggable Transports, such as obfs4, rely on the use of “bridge” " "relays." msgstr "" +"La mayoría de los Transportes Conectables, como obfs4, se basan en el uso de" +" repetidores \"puente\"." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -806,6 +838,8 @@ msgid "" "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " "of “bridge” relays." msgstr "" +"La mayoría de los [Transportes Conectables](/circumvention), como obfs4, se " +"basan en el uso de repetidores \"puente\"." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -814,6 +848,10 @@ msgid "" "relays, however, they are not listed publicly, so an adversary cannot " "identify them easily." msgstr "" +"Al igual que los repetidores de Tor normales, los puentes son operados por " +"voluntarios/as. Sin embargo, dichos puentes no están listados públicamente, " +"como sí lo están los repetidores normales, para que un adversario no los " +"pueda identificar fácilmente." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -837,7 +875,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### OBTENER DIRECCIONES DE PUENTES" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -845,6 +883,8 @@ msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have a few options:" msgstr "" +"Como las direcciones de puentes no son públicas, tendrás que solicitarlas tú" +" mismo. Tienes dos opciones:" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -856,6 +896,8 @@ msgstr "* Visita https://bridges.torproject.org/ y sigue las instrucciones, o" #: (content/bridges/contents+en.lrtopic.body) msgid "* Email bridges(a)torproject.org from a Gmail, or Riseup email address" msgstr "" +"* Escribe un correo a bridges(a)torproject.org desde una dirección de Gmail, " +"Yahoo, o Riseup" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -873,6 +915,8 @@ msgid "" "If you're starting Tor Browser for the first time, click 'Configure' to open" " the Tor Network Settings window." msgstr "" +"Cuando ejecutes el Tor Browser por primera vez, haz clic en 'Configurar' " +"para abrir la ventana de Configuración de la Red Tor." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -880,12 +924,17 @@ msgid "" "Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then" " on 'Tor' in the sidebar." msgstr "" +" De otra manera, cliqueá el Botón Tor a la izquierda de de la barra URL, " +"luego seleccioná 'Ajustes de red de Tor...' para acceder a éstas opciones." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "" "In the Tor Network Settings window, select 'Tor is censored in my country.'" msgstr "" +"En la ventana Configuración de la Red Tor, selecciona 'Tor está censurado en" +" mi país'. Luego, selecciona 'Proveer un puente que conozco' e ingresa cada " +"dirección de puente en una línea separada." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -902,7 +951,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "### INTRODUCIR DIRECCIONES DE PUENTE" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -991,7 +1040,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### THE URL BAR" -msgstr "" +msgstr "### La barra URL" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1061,7 +1110,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### LOGGING IN OVER TOR" -msgstr "" +msgstr "### INICIAR SESIONES SOBRE TOR" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1133,7 +1182,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### CAMBIAR IDENTIDADES Y CIRCUITOS" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1150,7 +1199,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW IDENTITY" -msgstr "" +msgstr "### NUEVA IDENTIDAD" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1180,7 +1229,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### NUEVO CIRCUITO TOR PARA ESTE SITIO" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1277,7 +1326,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### COMO ACCEDER UN SERVICIO CEBOLLA" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1309,7 +1358,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### SOLUCIÓN DE PROBLEMAS " #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1339,6 +1388,9 @@ msgid "" "You can also ensure that you're able to access other onion services by " "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)." msgstr "" +"También puedes asegurarte de poder acceder a otros servicios cebolla " +"conectando al [servicio cebolla de " +"DuckDuckGo](http://3g2upl4pq6kufc4m.onion)." #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) @@ -1418,7 +1470,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### ACCEDER A LA CONFIGURACIÓN DE SEGURIDAD" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1450,7 +1502,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### NIVELES DE SEGURIDAD" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1584,7 +1636,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### ACTUALIZAR EL NAVEGADOR TOR AUTOMÁTICAMENTE" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1601,7 +1653,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" -msgstr "" +msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1609,11 +1661,13 @@ msgid "" "Wait for the update to download and install, then Tor Browser will restart " "itself. You will now be running the latest version." msgstr "" +"Espera a que la actualización se descargue e instalala, luego reinicias el " +"Navegador Tor. Entonces estarás ejecutando la versión más reciente." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### ACTUALIZAR MANUALMENTE EL NAVEGADOR TOR" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1666,7 +1720,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### ARREGLOS RÁPIDOS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1725,7 +1779,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "### ¿ESTÁ CENSURADA TU CONEXIÓN?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1741,7 +1795,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### PROBLEMAS CONOCIDOS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1768,7 +1822,7 @@ msgstr "Cómo maneja el Tor Browser los complementos, plugins y JavaScript" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### FLASH PLAYER" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1802,7 +1856,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JAVASCRIPT" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1850,7 +1904,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### BROWSER ADD-ONS" -msgstr "" +msgstr "### COMPLEMENTOS DE NAVEGADOR" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) diff --git a/contents+fa.po b/contents+fa.po index 74f04bd96..515ae009e 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1,6 +1,5 @@ # Translators: # Ali Mirjamali <ali.mirjamali(a)gmail.com>, 2019 -# Emma Peel, 2019 # Seyyed Hossein Darvari <xhdix(a)yahoo.com>, 2019 # A.Mehraban <Mehr.Ban(a)chmail.ir>, 2019 # Arya Abidi <arya.abidi(a)gmail.com>, 2019 @@ -9,6 +8,7 @@ # MYZJ, 2019 # Vox, 2019 # Ali A D, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-07 10:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Ali A D, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -208,7 +208,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### تور چگونه کار می‌کند" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -297,7 +297,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### سایت های جایگزین" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -311,7 +311,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -327,7 +327,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### برای استفاده GETTOR از طریق ایمیل:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -356,7 +356,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 "### برای استفاده GetTor از طریق XMPP (مانند Jitsi یا CoyIM):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -482,7 +482,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser`" -msgstr "" +msgstr "`./start-tor-browser`" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -511,7 +511,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "### برقراری اتصال" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -544,7 +544,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### پیکربندی" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -630,7 +630,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### انواع انتقال جایگزین" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -729,7 +729,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "### با استفاده از حمل و نقل قابل حمل" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -758,7 +758,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "### باید از کدام ترنسپورت استفاده کنم؟" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -837,7 +837,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### گرفتن آدرس های پل" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -904,7 +904,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "### وارد کردن آدرس های پل" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -912,6 +912,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/tor-launcher-custom-bridges.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/tor-launcher-custom-bridges.png\">" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32303_fixup_squashed'
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit beb07216af27edf1eb3ee8788d3960a59d114d14 Merge: 1a0dcc9 d71e357 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 10:11:39 2019 +0000 Merge remote-tracking branch 'gk/bug_32303_fixup_squashed' .../go/0001-Use-fixed-go-build-tmp-directory.patch | 33 +++++++++++++ .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ++++++++++++++++++++++ projects/go/build | 14 +++--- projects/go/config | 36 ++++++++++++-- projects/gobsaes/config | 9 ++++ ...BILE_TMPDIR-env-variable-is-defined-use-t.patch | 35 +++++++++++++ projects/gomobile/config | 33 +++++++++++++ projects/goptlib/config | 8 +++ projects/goutls/config | 9 ++++ projects/goxexp/config | 19 ++++++++ projects/goximage/config | 28 +++++++++++ projects/goxnet/config | 9 ++++ projects/obfs4/build | 4 ++ projects/obfs4/config | 3 ++ projects/tor-onion-proxy-library/build | 10 ++++ projects/tor-onion-proxy-library/config | 2 + rbm.conf | 6 +++ 17 files changed, 304 insertions(+), 11 deletions(-)

1 0

[tor-browser-build/master] Bug 28803: Integrate building Pluggable Transports for Android
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit eee5d30a9ab1d727caac262cb62f72aaab75e0a0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 31 01:52:21 2019 +0000 Bug 28803: Integrate building Pluggable Transports for Android We integrate building Pluggable Transports for Android to solve #32303 in particular later on but it is important for providing snowflake support as well at some point (see: #28672) The bulk of the patch got written by boklm when trying to provide snowflake support for Android (#28672). --- .../go/0001-Use-fixed-go-build-tmp-directory.patch | 33 ++++++++++++++++++++ projects/go/build | 12 ++++---- projects/go/config | 30 +++++++++++++++++-- projects/gobsaes/config | 9 ++++++ ...BILE_TMPDIR-env-variable-is-defined-use-t.patch | 35 ++++++++++++++++++++++ projects/gomobile/config | 33 ++++++++++++++++++++ projects/goptlib/config | 8 +++++ projects/goutls/config | 9 ++++++ projects/goxexp/config | 19 ++++++++++++ projects/goximage/config | 28 +++++++++++++++++ projects/goxnet/config | 9 ++++++ projects/obfs4/build | 4 +++ projects/obfs4/config | 3 ++ projects/tor-onion-proxy-library/build | 10 +++++++ projects/tor-onion-proxy-library/config | 2 ++ rbm.conf | 6 ++++ 16 files changed, 241 insertions(+), 9 deletions(-) diff --git a/projects/go/0001-Use-fixed-go-build-tmp-directory.patch b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch new file mode 100644 index 0000000..a10e059 --- /dev/null +++ b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch @@ -0,0 +1,33 @@ +From 44e3391a5a3d9a2c4b57f78e43414465ab84681e Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Thu, 27 Jun 2019 19:21:05 +0200 +Subject: [PATCH] Use fixed go-build tmp directory + +Use fixed go-build tmp directory, when the directory does not exist, in +order to avoid some reproducibility issues where build directory gets +embedded in generated binaries. +--- + src/cmd/go/internal/work/action.go | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go +index 1f91046eb1..ba74b26a38 100644 +--- a/src/cmd/go/internal/work/action.go ++++ b/src/cmd/go/internal/work/action.go +@@ -224,9 +224,13 @@ func (b *Builder) Init() { + if cfg.BuildN { + b.WorkDir = "$WORK" + } else { +- tmp, err := ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") +- if err != nil { +- base.Fatalf("go: creating work dir: %v", err) ++ tmp := filepath.Join(os.Getenv("GOTMPDIR"), "go-build-workdir") ++ _, err := os.Stat(tmp) ++ if !os.IsNotExist(err) { ++ tmp, err = ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") ++ if err != nil { ++ base.Fatalf("go: creating work dir: %v", err) ++ } + } + if !filepath.IsAbs(tmp) { + abs, err := filepath.Abs(tmp) diff --git a/projects/go/build b/projects/go/build index 4945c88..aa092d6 100644 --- a/projects/go/build +++ b/projects/go/build @@ -28,6 +28,9 @@ export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" cd $rootdir [% IF ! c("var/linux") %] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # http://golang.org/doc/install/source#environment + export GOOS=[% c("var/GOOS") %] + export GOARCH=[% c("var/GOARCH") %] [% END %] # Building go @@ -48,9 +51,6 @@ cd /var/tmp/dist/go/src echo "#!/bin/sh" > "$CC_FOR_TARGET" echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" - # http://golang.org/doc/install/source#environment - export GOOS=darwin - export GOARCH=amd64 # faketime is needed because clang 3.9.1 on Darwin embeds the timestamps of # certain intermediate object files (including those that arise here while # compiling the Go runtime itself). Without this, variable timestamps would @@ -65,10 +65,10 @@ cd /var/tmp/dist/go/src echo "#!/bin/sh" > "$CC_FOR_TARGET" echo "exec [% c("arch") %]-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" - # http://golang.org/doc/install/source#environment - export GOOS=windows - export GOARCH=[% c("var/GOARCH") %] CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% ELSIF c("var/android") -%] + patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch + CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] cd /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index ffe07ea..31c510a 100644 --- a/projects/go/config +++ b/projects/go/config @@ -10,8 +10,13 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] - export GOOS=[% c("var/GOOS") %] - export GOARCH=[% c("var/GOARCH") %] + [% IF pc(c("origin_project"), "var/no_crosscompile") -%] + export GOOS=linux + export GOARCH=amd64 + [% ELSE -%] + export GOOS=[% c("var/GOOS") %] + export GOARCH=[% c("var/GOARCH") %] + [% END -%] export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" [% IF c("var/linux") -%] @@ -21,6 +26,8 @@ var: [% IF c("var/linux-i686") -%] export CGO_ENABLED=1 [% END -%] + export GOTMPDIR=/var/tmp/build/go-tmp + mkdir -p "$GOTMPDIR" # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. @@ -82,15 +89,32 @@ targets: linux-i686: var: GOARCH: 386 + android: + var: + GOOS: android + android-x86: + var: + GOARCH: 386 + android-x86_64: + var: + GOARCH: amd64 + android-armv7: + var: + GOARCH: arm + android-aarch64: + var: + GOARCH: arm64 input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") || c("var/osx") %]' + enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 + - filename: 0001-Use-fixed-go-build-tmp-directory.patch + enable: '[% c("var/android") %]' diff --git a/projects/gobsaes/config b/projects/gobsaes/config index 4da5828..0ced258 100644 --- a/projects/gobsaes/config +++ b/projects/gobsaes/config @@ -11,7 +11,16 @@ var: use_container: 1 go_lib: git.schwanenlied.me/yawning/bsaes.git +targets: + android: + var: + build_go_lib_pre: | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + input_files: - project: container-image - name: go project: go + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch b/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch new file mode 100644 index 0000000..770b22a --- /dev/null +++ b/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch @@ -0,0 +1,35 @@ +From 188307b6acd5003e82cb68872da9463f5f707515 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Thu, 27 Jun 2019 12:46:38 +0200 +Subject: [PATCH] If the GOMOBILE_TMPDIR env variable is defined, use that as + tmpdir + +Having the option to select a fixed tmpdir makes it possible to have +reproducible builds, as the build directory is embedded in the generated +executables. +--- + cmd/gomobile/env.go | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/cmd/gomobile/env.go b/cmd/gomobile/env.go +index 471b009..b97141b 100644 +--- a/cmd/gomobile/env.go ++++ b/cmd/gomobile/env.go +@@ -61,9 +61,14 @@ func buildEnvInit() (cleanup func(), err error) { + tmpdir = "$WORK" + cleanupFn = func() {} + } else { +- tmpdir, err = ioutil.TempDir("", "gomobile-work-") +- if err != nil { +- return nil, err ++ gomobile_tmpdir := os.Getenv("GOMOBILE_TMPDIR") ++ if gomobile_tmpdir != "" { ++ tmpdir = gomobile_tmpdir ++ } else { ++ tmpdir, err = ioutil.TempDir("", "gomobile-work-") ++ if err != nil { ++ return nil, err ++ } + } + } + if buildX { diff --git a/projects/gomobile/config b/projects/gomobile/config new file mode 100644 index 0000000..9dbfc29 --- /dev/null +++ b/projects/gomobile/config @@ -0,0 +1,33 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/mobile +git_hash: 92f3b9caf7ba8f4f9c10074225afcba0cba47a62 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + no_crosscompile: 1 + go_lib: golang.org/x/mobile + go_lib_deps: + - goximage + - goxexp + go_lib_install: + - golang.org/x/mobile/cmd/gobind + - golang.org/x/mobile/cmd/gomobile + build_go_lib_pre: | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +input_files: + - project: container-image + - name: go + project: go + - name: goximage + project: goximage + - name: goxexp + project: goxexp + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - filename: 0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch diff --git a/projects/goptlib/config b/projects/goptlib/config index 8c2a95d..4dfc6ff 100644 --- a/projects/goptlib/config +++ b/projects/goptlib/config @@ -18,7 +18,15 @@ targets: version: master tag_gpg_id: 0 + android: + var: + build_go_lib_pre: | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + input_files: - project: container-image - name: go project: go + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config index fa4b5d8..7a46517 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -17,6 +17,12 @@ var: - gocompress - gobsaes +targets: + android: + var: + build_go_lib_pre: | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + input_files: - project: container-image - name: go @@ -28,3 +34,6 @@ input_files: - name: gobsaes project: gobsaes - filename: sessionid.patch + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/goxexp/config b/projects/goxexp/config new file mode 100644 index 0000000..c81a65f --- /dev/null +++ b/projects/goxexp/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/exp +git_hash: a1d7652674e8f269b17d9be90d3c4c1d0e8830e8 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + no_crosscompile: 1 + go_lib: golang.org/x/exp + go_lib_install: [] + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goximage/config b/projects/goximage/config new file mode 100644 index 0000000..308a1ba --- /dev/null +++ b/projects/goximage/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/image +git_hash: 0694c2d4d067f97ebef574d63a763ee8ab559da7 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + no_crosscompile: 1 + go_lib: golang.org/x/image + go_lib_install: + - golang.org/x/image/webp + - golang.org/x/image/bmp + - golang.org/x/image/draw + - golang.org/x/image/font + - golang.org/x/image/math/fixed + - golang.org/x/image/math/f32 + - golang.org/x/image/math/f64 + - golang.org/x/image/vp8 + - golang.org/x/image/vp8l + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config index f6a2c29..5394875 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -16,9 +16,18 @@ var: go_lib_deps: - goxsys +targets: + android: + var: + build_go_lib_pre: | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + input_files: - project: container-image - name: go project: go - name: goxsys project: goxsys + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/obfs4/build b/projects/obfs4/build index 33b0add..53b83df 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -5,6 +5,10 @@ distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] diff --git a/projects/obfs4/config b/projects/obfs4/config index d9357bb..21bdab6 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -36,3 +36,6 @@ input_files: project: goutls - name: goxtext project: goxtext + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 0b949a3..0f2d976 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -22,6 +22,16 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/canceldormant.patch +# Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy +tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] + +# Overwrite the obfs4proxy binary provided by Pluto +for d in external/pluto/bin/*; do + cp obfs4proxy $d/ +done + +rm obfs4proxy + # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c2bd1a4..ff3432c 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -25,6 +25,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: obfs4 + name: obfs4 - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/rbm.conf b/rbm.conf index 727c09f..aaa6e3a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -183,6 +183,7 @@ targets: var: android-armv7: 1 osname: android-armv7 + toolchain_arch: arm torbrowser-android-x86: - android-x86 - android @@ -191,6 +192,7 @@ targets: var: android-x86: 1 osname: android-x86 + toolchain_arch: x86 torbrowser-android-x86_64: - android-x86_64 - android @@ -199,6 +201,7 @@ targets: var: android-x86_64: 1 osname: android-x86_64 + toolchain_arch: x86_64 torbrowser-android-aarch64: - android-aarch64 - android @@ -207,6 +210,7 @@ targets: var: android-aarch64: 1 osname: android-aarch64 + toolchain_arch: arm64 android: var: android: 1 @@ -219,6 +223,8 @@ targets: android_min_api_x86: 16 android_min_api_x86_64: 21 snowflake: 0 + CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' + CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: suite: stretch arch: amd64

1 0

[tor-browser-build/master] Bug 32413: Bump Go to 1.12.13
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit d71e357c70606afd1c3bbbc41161be833ed62c93 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 6 21:06:52 2019 +0000 Bug 32413: Bump Go to 1.12.13 Pick up security fixes. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index cf95b90..371f8c2 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.9 +version: 1.12.13 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -112,7 +112,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc + sha256sum: 5383d3b8db4baa48284ffcb14606d9cad6f03e9db843fa6d835b94d63cccf5a7 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 32303: Fix broken obfs4 on Android Q
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit 878a3855c2b7fc5146cd8c38d2b25a7ed427c7e9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Oct 26 17:15:20 2019 +0000 Bug 32303: Fix broken obfs4 on Android Q Backport go patch #29674 that drops the TLS section on Android. --- .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ++++++++++++++++++++++ projects/go/build | 2 + projects/go/config | 2 + 3 files changed, 61 insertions(+) diff --git a/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch b/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch new file mode 100644 index 0000000..dc66809 --- /dev/null +++ b/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch @@ -0,0 +1,57 @@ +From 90a3ce02dc25adcf1598faf11a66b151ada3f637 Mon Sep 17 00:00:00 2001 +From: Elias Naur <mail(a)eliasnaur.com> +Date: Wed, 27 Mar 2019 14:25:24 +0100 +Subject: [PATCH] cmd/link/internal/ld: skip TLS section on Android + +We don't use the TLS section on android, and dropping it avoids +complaints about underalignment from the Android Q linker. + +Updates #29674 + +Change-Id: I91dabf2a58e6eb1783872639a6a144858db09cef +Reviewed-on: https://go-review.googlesource.com/c/go/+/169618 +Reviewed-by: Ian Lance Taylor <iant(a)golang.org> +--- + src/cmd/link/internal/ld/lib.go | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go +index 1d44c0eb18b..b331e39fe3e 100644 +--- a/src/cmd/link/internal/ld/lib.go ++++ b/src/cmd/link/internal/ld/lib.go +@@ -453,18 +453,23 @@ func (ctxt *Link) loadlib() { + } + } + +- tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) +- +- // runtime.tlsg is used for external linking on platforms that do not define +- // a variable to hold g in assembly (currently only intel). +- if tlsg.Type == 0 { +- tlsg.Type = sym.STLSBSS +- tlsg.Size = int64(ctxt.Arch.PtrSize) +- } else if tlsg.Type != sym.SDYNIMPORT { +- Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) +- } +- tlsg.Attr |= sym.AttrReachable +- ctxt.Tlsg = tlsg ++ // The Android Q linker started to complain about underalignment of the our TLS ++ // section. We don't actually use the section on android, so dont't ++ // generate it. ++ if objabi.GOOS != "android" { ++ tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) ++ ++ // runtime.tlsg is used for external linking on platforms that do not define ++ // a variable to hold g in assembly (currently only intel). ++ if tlsg.Type == 0 { ++ tlsg.Type = sym.STLSBSS ++ tlsg.Size = int64(ctxt.Arch.PtrSize) ++ } else if tlsg.Type != sym.SDYNIMPORT { ++ Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) ++ } ++ tlsg.Attr |= sym.AttrReachable ++ ctxt.Tlsg = tlsg ++ } + + var moduledata *sym.Symbol + if ctxt.BuildMode == BuildModePlugin { diff --git a/projects/go/build b/projects/go/build index aa092d6..2ebfd58 100644 --- a/projects/go/build +++ b/projects/go/build @@ -68,6 +68,8 @@ cd /var/tmp/dist/go/src CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch + # Obfs4 breaks on Android Q without this patch, see: #32303 + patch -p2 < $rootdir/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] diff --git a/projects/go/config b/projects/go/config index 31c510a..cf95b90 100644 --- a/projects/go/config +++ b/projects/go/config @@ -118,3 +118,5 @@ input_files: sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 - filename: 0001-Use-fixed-go-build-tmp-directory.patch enable: '[% c("var/android") %]' + - filename: 90a3ce02dc25adcf1598faf11a66b151ada3f637.patch + enable: '[% c("var/android") %]'

1 0