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

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to latest changes
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit b744ccf7e59c60cf7929f77c71a6494e91d4e1da Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 9 07:15:17 2019 +0000 Update Torbutton to latest changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 4f453d5570d4..3509fb9c4e9d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 4f453d5570d4177f82f2215d8041f901a13a92a1 +Subproject commit 3509fb9c4e9db216066a0d102f37d9e3d1434ef0

1 0

[torbutton/master] Bug 31747: Move new identity and new circuit icons to browser repo
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit 3509fb9c4e9db216066a0d102f37d9e3d1434ef0 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 4 19:12:49 2019 +0200 Bug 31747: Move new identity and new circuit icons to browser repo --- chrome/content/torbutton.js | 54 --------------------------------------------- chrome/skin/new_circuit.svg | 8 ------- chrome/skin/torbutton.css | 10 +-------- 3 files changed, 1 insertion(+), 71 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 907e4278..79f9843b 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -345,60 +345,6 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - // Add torbutton and security level buttons to the bar. - // This should maybe be in the startup function, but we want to add - // the button to the panel before it's state (color) is set.. - let insertedButton = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button"); - let insertedSecurityLevel = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level"); - if (!insertedButton || !insertedSecurityLevel) { - try { - // ESR31-style toolbar is handled by the existing compiled-in pref. - // We also need to prevent first-run toolbar reorg (#13378), so we - // reset this toolbar state on first-run. - try { - // get serialized toolbar state - let uiCustomizationStateJSON = m_tb_prefs.getStringPref("browser.uiCustomization.state"); - let uiCustomizationState = JSON.parse(uiCustomizationStateJSON); - - let placeButtonAfterUrlbar = function(navBar, buttonId) { - torbutton_log(3, 'placing ' + buttonId); - // try and remove button if it's present - let buttonIndex = navBar.indexOf(buttonId); - if (buttonIndex != -1) { - navBar.splice(buttonIndex, 1); - } - // if urlbar isn't present (which *shouldn't* be possible), - // inserts button at the beginning of the toolbar (since urlbarIndex will be -1) - let urlbarIndex = navBar.indexOf("urlbar-container"); - buttonIndex = urlbarIndex + 1; - navBar.splice(buttonIndex, 0, buttonId); - }; - - // array of navbar elements - let navBar = uiCustomizationState["placements"]["nav-bar"]; - placeButtonAfterUrlbar(navBar, "security-level-button"); - placeButtonAfterUrlbar(navBar, "torbutton-button"); - - // serialize back into pref - uiCustomizationStateJSON = JSON.stringify(uiCustomizationState, null, 0); - m_tb_prefs.setStringPref("browser.uiCustomization.state", uiCustomizationStateJSON); - } catch(e) { - torbutton_log(4, 'error updating toolbar, reverting to default : ' + e); - // reverts the serialized toolbar state to default set in Tor Browser - m_tb_prefs.clearUserPref("browser.uiCustomization.state"); - } - // reverts toolbar state to firefox defaults - CustomizableUI.reset(); - // 'restores' toolbar state from serialized state in "browser.uiCustomization.state" - CustomizableUI.undoReset(); - torbutton_log(3, 'toolbar updated'); - m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); - m_tb_prefs.setBoolPref("extensions.torbutton.inserted_security_level", true); - } catch(e) { - torbutton_log(4, 'failed to update the toolbar : ' + e); - } - } - torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); diff --git a/chrome/skin/new_circuit.svg b/chrome/skin/new_circuit.svg deleted file mode 100644 index e0a93cc8..00000000 --- a/chrome/skin/new_circuit.svg +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Icon / New Circuit(a)1.5x</title> - <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> - <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> - </g> -</svg> diff --git a/chrome/skin/torbutton.css b/chrome/skin/torbutton.css index 638520f9..669e05e5 100644 --- a/chrome/skin/torbutton.css +++ b/chrome/skin/torbutton.css @@ -58,12 +58,4 @@ svg#tor-circuit circle.node-circle { stroke: #195021; stroke-width: 2px; fill: white; -} - -#appMenuNewIdentity { - list-style-image: url("chrome://browser/skin/reload.svg"); -} - -#appMenuNewCircuit { - list-style-image: url("chrome://torbutton/skin/new_circuit.svg"); -} +} \ No newline at end of file

1 0

[tor-browser-build/master] Bug 31968: Don't fail if /proc/cpuinfo is not readable
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit 6cf4e6eabc5eb559baf9721a3caf0544b7480093 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 8 20:10:48 2019 +0200 Bug 31968: Don't fail if /proc/cpuinfo is not readable We use /proc/cpuinfo to check for SSE2 support, however on some systems it isn't readable by ordinary users, so we just assume that SSE2 is available in this case. --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 1adad8f..9356d4c 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -96,7 +96,7 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -if ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then +if test -r /proc/cpuinfo && ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then complain "Tor Browser requires a CPU with SSE2 support. Exiting." exit 1 fi

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 3b8fb9c7607c0f89c3212ea13a486461faa980fb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 05:23:26 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 4aeeed2df..8be736dc0 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1008,16 +1008,18 @@ msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." msgstr "" +"Tor yazılımları kar amacı gütmeyen (hayır amaçlı) bir kuruluş olan Tor " +"Projesi tarafından geliştirilip güncellenmektedir. " #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) msgid "Why is it called Tor?" -msgstr "" +msgstr "Adı neden Tor?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Because Tor is the onion routing network." -msgstr "" +msgstr "Tor bir soğan yöneltici (onion routing) ağı olduğundan." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1026,6 +1028,10 @@ msgid "" "onion routing in 2001-2002, we would tell people we were working on onion " "routing, and they would say \"Neat. Which one?\"" msgstr "" +"2001-2002 yıllarında yeni nesil onion routing tasarımı ve uygulaması ile " +"ilgili çalışmaya başladığımızda ve başkalarına onion routing üzerinde " +"çalıştığımızı söylediğimizde \"Çok iyi. Peki hangisi?\" şeklinde yanıt " +"alıyorduk." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1034,23 +1040,26 @@ msgid "" " of the actual [onion routing project](http://www.onion-router.net/) run by " "the Naval Research Lab." msgstr "" +"Onion routing günlük kullanılan bir terim olsa bile, Tor Donanma Araştırma " +"Laboratuvarları tarafından yürütülen gerçek [onion routing " +"projesi](http://www.onion-router.net/) içinden çıktı." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "(It's also got a fine translation from German and Turkish.)" -msgstr "" +msgstr "(aynı zamanda güzel Almanca ve Türkçe çevirileri var)." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "" "Note: even though it originally came from an acronym, Tor is not spelled " "\"TOR\"." -msgstr "" +msgstr "Not: Özgün adı bir kısaltma olmasına rağmen, Tor \"TOR\" olarak yazılmaz." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Only the first letter is capitalized." -msgstr "" +msgstr "Yalnız ilk harfi büyük kullanılmıştır." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1059,6 +1068,9 @@ msgid "" " have instead learned everything they know about Tor from news articles) by " "the fact that they spell it wrong." msgstr "" +"Aslında genellikle yazış şekillerine bakarak, web sitemize hiç bakmamış (ve " +"bunun yerine Tor hakkında bildiklerini etraftaki haberlerden öğrenmiş) " +"kişileri hemen ayırt edebiliyoruz." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) @@ -1112,6 +1124,8 @@ msgid "" "For example, `torbrowser-install-win64-8.5.5_en-US.exe` is accompanied by " "`torbrowser-install-win64-8.5.5_en-US.exe.asc`." msgstr "" +"Örneğin, `torbrowser-install-win64-8.5.5_en-US.exe` dosyasının imza dosyası " +"`torbrowser-install-win64-8.5.5_en-US.exe.asc` şeklindedir." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1355,6 +1369,8 @@ msgid "" "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.5_en-" "US.exe.asc Downloads\torbrowser-install-win64-8.5.5_en-US.exe" msgstr "" +"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.5_en-" +"US.exe.asc Downloads\torbrowser-install-win64-8.5.5_en-US.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1362,6 +1378,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.5-osx64_en-" "US.dmg{.asc,}" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.5-osx64_en-" +"US.dmg{.asc,}" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1377,6 +1395,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-8.5.5_en-" "US.tar.xz{.asc,}" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-8.5.5_en-" +"US.tar.xz{.asc,}" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1997,6 +2017,12 @@ msgid "" "servers in various parts of the world, and some bottlenecks and network " "latency will always be present." msgstr "" +"Tor ağında günlük olarak bir milyondan fazla kullanıcı bulunuyor ve tüm " +"trafiği yönlendiren 6.000 üzerinde aktarıcı var. Sunucular üzerindeki yük " +"bazen gecikmelere neden olabiliyor. Tasarımın doğası gereği verileriniz " +"dünya üzerinde değişik konumlarda bulunan ve gönüllüler tarafından işletilen" +" sunucular üzerinden geçirildiğinden her zaman bazı dar boğazlar ve ağ " +"gecikmeleri olacaktır." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -2017,6 +2043,11 @@ msgid "" "Research Topics: 2018 edition](https://blog.torproject.org/tors-open-" "research-topics-2018-edition) about Network Performance." msgstr "" +"Çok daha ayrıntılı bir yanıt için [Roger tarafından bu konuda yazılan blog " +"iletisine](https://blog.torproject.org/blog/why-tor-is-slow) ve ağ başarımı " +"hakkında [Tor Açık Araştırma Konuları: 2018 " +"sürümü](https://blog.torproject.org/tors-open-research-topics-2018-edition) " +"metinlerine bakabilirsiniz." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -2351,6 +2382,9 @@ msgid "" "it would load in another browser. This type of behavior can be dangerous and" " break anonymity." msgstr "" +"Yani bir web sitesi bazen Tor Browser ile bazen başka bir web tarayıcısı ile" +" yüklenebilir. Bu davranış tehlikeli olabilir ve anonim kalmanızı zora " +"sokar." #: https//support.torproject.org/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.title)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit db52e76bf01d941baec62db559d98768b2ab0ce6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 04:53:14 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 0b8183c30..4aeeed2df 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -847,12 +847,12 @@ msgstr "" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Doesn't the first server see who I am?" -msgstr "" +msgstr "### Birinci sunucu kim olduğumu bilemez mi?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "Possibly." -msgstr "" +msgstr "Olabilir." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -860,22 +860,27 @@ msgid "" "A bad first of three servers can see encrypted Tor traffic coming from your " "computer." msgstr "" +"Maalesef üç sunucunun ilki bilgisayarınızdan şifrelenmiş Tor verilerinin " +"geldiğini görebilir." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It still doesn't know who you are and what you are doing over Tor." msgstr "" +"Bununla birlikte kim olduğunuzu ve Tor üzerinde ne yaptığınızı bilemez." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It merely sees \"This IP address is using Tor\"." -msgstr "" +msgstr "Tek bilebileceği \"Bu IP adresi Tor kullanıyor\" olur." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "Tor is not illegal anywhere in the world, so using Tor by itself is fine." msgstr "" +"Tor uygulamasını kullanmak dünya üzerinde hiç bir yerde kanun dışı değildir." +" Bu nedenle yalnız Tor kullanmakta sorun yoktur." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -883,27 +888,30 @@ msgid "" "You are still protected from this node figuring out both who you are and " "where you are going on the Internet." msgstr "" +"Hala, kim olduğunuz ve İnternet üzerinde nereye baktığınız gibi bilgilerin " +"bu durak tarafından öğrenilmesine karşı korunmuş olursunuz." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Can't the third server see my traffic?" -msgstr "" +msgstr "### Üçüncü sunucu verilerimi göremez mi?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "A bad third of three servers can see the traffic you sent into Tor." msgstr "" +"Maalesef bu sunucuların üçüncüsü Tor ağına gönderdiğiniz verileri görebilir." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It won't know who sent this traffic." -msgstr "" +msgstr "Ancak bu verileri kimin gönderdiğini bilemez." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "If you're using encryption (like HTTPS), it will only know the destination." -msgstr "" +msgstr "Şifreleme (HTTPS gibi) kullanıyorsanız yalnız hedefi bilebilir." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -911,17 +919,21 @@ msgid "" "See this visualization of [Tor and HTTPS](/https/https-1/) to understand how" " Tor and HTTPS interact." msgstr "" +"Buradaki [Tor ve HTTPS](/https/https-1/) görselleştirmesine bakarak Tor ile " +"HTTPS etkileşimini anlayabilirsiniz." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.title) msgid "" "Does Tor remove personal information from the data my application sends?" msgstr "" +"Tor kullandığım uygulamanın gönderdiği veriler içinden kişisel bilgilerimi " +"siler mı?" #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) msgid "No, it doesn't." -msgstr "" +msgstr "Hayır, böyle bir şey yapmaz." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -929,6 +941,9 @@ msgid "" "You need to use a separate program that understands your application and " "protocol and knows how to clean or \"scrub\" the data it sends." msgstr "" +"Bunun için, kullandığınız uygulamayı ve iletişim kuralını tanıyan ve " +"uygulama tarafından gönderilen verileri nasıl temizleyeceğini ya da " +"değiştireceğini bilen ayrı bir uygulama kullanmanız gerekir." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -936,12 +951,15 @@ msgid "" "Tor Browser tries to keep application-level data, like the user-agent " "string, uniform for all users." msgstr "" +"Tor Browser, web tarayıcı sürümü gibi uygulama düzeyinde belirleyici " +"bilgileri tüm kullanıcılar için aynı olacak şekilde değiştirmeye çalışır." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) msgid "" "Tor Browser can't do anything about text that you type into forms, though." msgstr "" +"Tor Browser formlara yazdığınız metinler ile ilgili hiç bir şey yapamaz." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) @@ -963,6 +981,14 @@ msgid "" " you visit, and it prevents the sites you visit from learning your physical " "location. This set of volunteer relays is called the Tor network." msgstr "" +"Tor uygulaması bilgisayarınızda çalıştırabileceğiniz ve İnternet üzerinde " +"sizinle ilgili bilgilerin korunmasına yardımcı olan bir programdır. İnternet" +" trafiği verilerinizi, dünyanın çeşitli yerlerinde bulunan gönüllüler " +"tarafından işletilen aktarıcılardan oluşan bir ağ içinde dolaştırarak, " +"İnternet bağlantınızın izlenmesinin önüne geçer ve hangi sitelere " +"baktığınız, hangi coğrafi konumda bulunduğunuz gibi bilgilerin öğrenilmesini" +" engeller. Bu gönüllü aktarıcı noktalarının oluşturduğu yapıya Tor Ağı " +"denir." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -971,6 +997,10 @@ msgid "" "Firefox that fixes many privacy issues. You can read more about Tor on our " "[about](https://www.torproject.org/about/history/) page." msgstr "" +"Çoğu insan Tor ağını, engellenen web sitelerine erişmek ve kim olduğunun " +"açığa çıkmasını engellemek için geliştirilmiş bir Firefox sürümü olan Tor " +"Browser uygulaması üzerinden kullanır. Tor hakkında ayrıntılı bilgi almak " +"için [buraya bakabilirsiniz](https://www.torproject.org/about/history/)." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description)

1 0

[translation/policies-code_of_conducttxtpot_completed] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot_completed
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit b29675bce22eb14e8de6f9f3ffff0817bfd29011 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 02:17:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+zh_CN.po | 700 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 700 insertions(+) diff --git a/code_of_conduct+zh_CN.po b/code_of_conduct+zh_CN.po new file mode 100644 index 000000000..4959ae564 --- /dev/null +++ b/code_of_conduct+zh_CN.po @@ -0,0 +1,700 @@ +# Code of conduct of the tor project +# Copyright (C) 2019 tor project. +# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0 +# International license.e. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# ciaran <ciaranchen(a)qq.com>, 2019 +# Cloud P <heige.pcloud(a)outlook.com>, 2019 +# ff98sha, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Code of conduct of the Tor Project\n" +"POT-Creation-Date: 2019-08-02 12:00+0000\n" +"PO-Revision-Date: 2019-08-27 18:54+0000\n" +"Last-Translator: ff98sha, 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" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. type: Plain text +#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24 +#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75 +#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180 +#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213 +#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243 +#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278 +#, no-wrap +msgid "============================================================\n" +msgstr "============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:3 +#, no-wrap +msgid "" +"Tor Project Code of Conduct\n" +"============================================================\n" +msgstr "" +"Tor 项目行为准则\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:6 +msgid "Statement of Intent:" +msgstr "宗旨陈述：" + +#. type: Plain text +#: ../code_of_conduct.txt:10 +msgid "" +"The Tor Project is committed to fostering an inclusive environment and " +"community. Tor is a place where people should feel safe to engage, share " +"their point of view, and participate." +msgstr "Tor 项目致力于营造一个包容性的社区环境。Tor 应该是人们可以放心参与，分享观点的地方。" + +#. type: Plain text +#: ../code_of_conduct.txt:15 +msgid "" +"This code of conduct applies to The Tor Project as a whole. It is intended " +"to provide guidelines for contributors. Employees and contractors of The Tor" +" Project, Inc. (TPI) are also subject to company policies and procedures. " +"Those people should feel free to contact HR with questions or concerns." +msgstr "" +"该行为准则适用于整个Tor 项目。它旨在为贡献者提供指导。The Tor Project, " +"Inc.（TPI）的员工和承包商也受公司政策和程序的约束。人们可以随时联系人力资源部以提出问题或疑虑。" + +#. type: Plain text +#: ../code_of_conduct.txt:23 +msgid "" +"This code of conduct is not exhaustive or complete. It is an ongoing effort " +"to summarize our shared understanding. We want to provide a welcoming, safe " +"environment, so we can work together to pursue powerful solutions. We " +"reserve the right to deviate from strictly enforcing this code. Any " +"deviations must produce an outcome which is fairer, and aligned with our " +"values. We understand that keeping a living document relevant and “patched” " +"involves sustained effort." +msgstr "" +"本行为准则并不详尽或完整。总结我们的共识是一项持续的工作。我们希望提供一个温馨，安全的环境，因此我们共同努力，寻求有力的解决方案。我们保留弹性执行此代码的权利。任何特例都必须产生更公平的结果，并与我们的价值观保持一致。我们理解保持活动文档的相关性并对其进行“修补”需要持续的努力。" + +#. type: Plain text +#: ../code_of_conduct.txt:26 +#, no-wrap +msgid "" +"0. Summary: Don't be a jerk. Be awesome instead.\n" +"============================================================\n" +msgstr "" +"0. 概述：不要成为垃圾人。做一个优秀的人。\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:29 +msgid "The Tor community should be a good place where people are glad to be." +msgstr "Tor 社区应该是人们乐于驻足停留的好地方。" + +#. type: Plain text +#: ../code_of_conduct.txt:31 +#, no-wrap +msgid " DO: Be kind, thoughtful, and considerate.\n" +msgstr "请务必：友善，三思，为他人着想。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:33 +#, no-wrap +msgid " DO: Make Tor a place where people are happy and comfortable.\n" +msgstr "请务必：创造一个让人们能快乐舒适的地方。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:36 +#, no-wrap +msgid "" +" DO: Remember: We are all contributing; we are all learning. Nobody was born\n" +" an expert.\n" +msgstr "请务必记住：我们都在做出共享；我们都在倾听。没有人生来就是专家。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr "请务必：伏地倾听，确保每个人的声音都能被听见。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr "请务必不要：侮辱，骚扰，恐吓，或成为一个混蛋。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:43 +#, no-wrap +msgid "" +" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n" +" learning.\n" +msgstr "" +"请务必不要：将错误作为麻烦别人的借口。错误是用于\n" +"学习的。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:46 +#, no-wrap +msgid "" +" DON'T: Hunt for ways to uphold the letter of this code while violating its\n" +" spirit.\n" +msgstr "" +"请务必不要：寻找方法来维持行为准则，同时违反\n" +"其精神。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:50 +#, no-wrap +msgid "" +" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n" +" questions or concerns. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" +msgstr "" +"并且务必：积极发送电子邮件至 tor-community-council(a)lists.torproject.org\n" +"提出问题与关切。公钥：\n" +"https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" + +#. type: Plain text +#: ../code_of_conduct.txt:53 +#, no-wrap +msgid "" +"1. Purpose\n" +"============================================================\n" +msgstr "" +"1. 宗旨\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:63 +msgid "" +"A primary goal of the Tor community is to be inclusive of many different " +"contributors. We want to include contributors from the most varied and " +"diverse backgrounds possible. As such, we are committed to providing a " +"friendly, safe and welcoming environment for all, regardless of their " +"experience, gender identity or expression, sexual orientation, family, " +"relationships, ability (whether bodily or mental), personal appearance, " +"socioeconomic status, body size, race, ethnicity, age, religion, " +"nationality, or membership in a disadvantaged and/or underrepresented group." +msgstr "" +"Tor " +"社区的主要目标是包容许多不同的贡献者。我们希望包括来自不同背景的贡献者。因此，我们致力于为所有人提供友好，安全和热情的环境，无论他们的经验、性别认同或表达方式、性取向、家庭、人际关系、能力（无论是身体还是精神上）、个人面貌、社会经济地位、身材、种族、年龄、宗教、国籍或弱势群体成员的身份。" + +#. type: Plain text +#: ../code_of_conduct.txt:68 +msgid "" +"A safe environment means one free from abuse, whether isolated or systemic. " +"We explicitly acknowledge that tolerating abuse is a security problem. " +"Allowing abusers and malicious people to disrupt our community puts our " +"software, developers, and users at risk." +msgstr "" +"一个安全的环境意味着一个不受虐待的环境，无论是孤立的还是系统的。我们明确承认容忍滥用是一个安全问题。允许滥用者和恶意人员破坏我们的社区会使我们的软件，开发人员和用户面临风险。" + +#. type: Plain text +#: ../code_of_conduct.txt:71 +msgid "" +"This code of conduct outlines our expectations for all those who participate" +" in our community, as well as the consequences for unacceptable behavior." +msgstr "该行为准则概述了我们对所有参与我们社区的人们的期望，以及对不可接受行为的后果。" + +#. type: Plain text +#: ../code_of_conduct.txt:74 +msgid "" +"We invite all those who participate in The Tor Project to help us create " +"safe and positive experiences for everyone." +msgstr "我们邀请所有参与 Tor 项目的人员帮助我们为每个人创造安全，积极的体验。" + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" +"2.成为最好的自己\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:80 +msgid "" +"The following behaviors are expected and requested of all community members:" +msgstr "所有社区成员都被期望与请求实行下行为：" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:83 +msgid "" +"Participate in an honest and active way. In doing so, you contribute to the " +"health and longevity of this community." +msgstr "以诚实和积极的方式参与社区活动。这样，您可以为这个社区的健康和持续发展做出贡献。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:85 +msgid "Exercise consideration and respect in your speech and actions." +msgstr "在发言与行为中需要考虑对他人的尊重。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:87 +msgid "Attempt collaboration and dialog before engaging in conflict." +msgstr "在冲突之前尝试协作和对话。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:89 +msgid "" +"Refrain from demeaning, discriminatory, or harassing behavior and speech." +msgstr "避免贬低，歧视或骚扰的行为和言论。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:92 +msgid "" +"Be mindful of your surroundings and of your fellow participants. Alert " +"community leaders if you notice:" +msgstr "注意周围的环境和参与者。如果您发现以下情况，请通知社区领导人：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:94 +msgid "a dangerous situation" +msgstr "一个危险的情况" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:96 +msgid "someone in distress" +msgstr "遭遇危险的人" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:98 +msgid "violations of this code of conduct, even if they seem minor" +msgstr "违反本行为准则，即使它们看上去似乎是小事" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:101 +msgid "" +"Remember that community event venues may be shared with members of the " +"public. Please be respectful to everyone using these locations." +msgstr "请记住，社区活动场所可能会与公众共享。请尊重使用这些场所的每个人。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:103 +msgid "Respect the privacy of your fellow community members." +msgstr "尊重社区其他成员的隐私。" + +#. type: Plain text +#: ../code_of_conduct.txt:106 +#, no-wrap +msgid "" +"3. Unacceptable behaviors\n" +"============================================================\n" +msgstr "" +"3. 不可接受的行为\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:109 +msgid "The following behaviors are unacceptable within our community:" +msgstr "以下行为在我们的社区是不可接受的：" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:114 +msgid "" +"Violence, sexual assault, threats of violence, or violent language directed " +"against another person, especially violence against a person or group based " +"on a protected characteristic. (Display of weapons may constitute " +"intimidation or a threat of violence.)" +msgstr "暴力、性侵犯、暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:117 +msgid "" +"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" +" jokes and language." +msgstr "性别歧视、种族歧视、仇视同性恋、仇视恐怖、能力歧视或其他歧视性笑话和语言。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:122 +msgid "" +"Spontaneously posting or displaying sexually explicit or violent material. " +"(If it is necessary to share such material when working on Tor's mission, do" +" so with sensitivity. Be aware that many people don't want to see it.)" +msgstr "自发地发布露骨或暴力的内容。（如果在执行 Tor 的任务时有必要共享此类材料，请谨慎地进行。请注意，很多人都不想看到此类内容。）" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:125 +msgid "" +"Posting or threatening to post other people’s personally identifying " +"information (\"doxing\") without their consent." +msgstr "未经他人同意而张贴或威胁要张贴他人的个人识别信息（“加密”）。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:127 +msgid "Personal insults or attacks, particularly those related to:" +msgstr "人身侮辱或攻击，尤其是与以下方面有关的：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:129 +msgid "experience" +msgstr "经历与经验" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:131 +msgid "gender identity or expression" +msgstr "性别认同与表达" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:133 +msgid "sexual orientation" +msgstr "性取向" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:135 +msgid "family" +msgstr "家庭" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:137 +msgid "relationships" +msgstr "关系" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:139 +msgid "ability (whether bodily or mental)" +msgstr "能力（心理与生理）" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:141 +msgid "personal appearance" +msgstr "个人外貌" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:143 +msgid "socioeconomic status" +msgstr "社会经济情况" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:145 +msgid "body size" +msgstr "身材" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:147 +msgid "race" +msgstr "比赛" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:149 +msgid "ethnicity" +msgstr "种族" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:151 +msgid "age" +msgstr "年龄" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:153 +msgid "religion" +msgstr "地区" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:155 +msgid "nationality" +msgstr "国籍" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:157 +msgid "membership in a disadvantaged and/or underrepresented group" +msgstr "弱势/缺陷群体成员" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:161 +msgid "" +"Inappropriate photography, audio recording, or recording of personal " +"information. You should have someone's consent before recording these " +"things, and before posting them publicly." +msgstr "不适当的录像、录音或个人信息记录。在记录这些东西之前以及在公开发布它们之前，您应该获得某人的同意。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:164 +msgid "" +"Inappropriate physical contact. You should have someone’s consent before " +"touching them." +msgstr "不当的物理接触。您必须先征得他人的同意，然后再与他们接触。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:167 +msgid "" +"Unwelcome sexual attention: this includes sexualized comments or jokes, " +"inappropriate touching, groping, and unwelcome sexual advances." +msgstr "不欢迎的性关注：这包括有关于性的评论或笑话，不适当的抚摸，摸索和不受欢迎的性行为。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:169 +msgid "Deliberate intimidation, stalking or following (online or in person)." +msgstr "故意恐吓或跟踪（线上或线下）。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:172 +msgid "" +"Deliberately undermining the spirit of this code while following the letter." +msgstr "在遵循规定时故意破环该行为准则的精神。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:175 +msgid "" +"Sustained disruption of any community events, including talks, " +"presentations, and online conversations." +msgstr "持续中断任何的社区活动，包括谈话，演示和在线对话。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:177 +msgid "Deliberately pushing against someone's stated boundaries." +msgstr "故意触犯某人的底线。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:179 +msgid "Advocating for, or encouraging, any of the above behavior." +msgstr "提倡或鼓励上述任何行为。" + +#. type: Plain text +#: ../code_of_conduct.txt:182 +#, no-wrap +msgid "" +"4. Unacceptable behavior has consequences\n" +"============================================================\n" +msgstr "" +"4.不可接受的行为及其后果\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:188 +msgid "" +"We will not tolerate unacceptable behavior from any community member. We " +"will not make exceptions for sponsors and those with decision-making " +"authority. People in formal or informal leadership roles must model the " +"highest standards of behavior." +msgstr "我们不会容忍任何社区成员的不可接受的行为。我们对那些有/无决策权的赞助商也不会例外。担任正式或非正式领导职务的人必须树立最高的行为标准。" + +#. type: Plain text +#: ../code_of_conduct.txt:192 +msgid "" +"Anyone asked by another community member to stop unacceptable behavior is " +"expected to comply immediately. Please don't step in on someone else's " +"behalf without their consent." +msgstr "任何来自其他社区成员的要求停止不可接受行为的请求都应立即被遵守。未经他人同意，请勿代表他人介入。" + +#. type: Plain text +#: ../code_of_conduct.txt:195 +#, no-wrap +msgid "" +"5. Where to go for help\n" +"============================================================\n" +msgstr "" +"5.去哪里寻求帮助\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:201 +msgid "" +"The Community Council is an elected body of Tor Core Contributors who can " +"assist with intra-community conflict resolution. Community Council policies " +"and information can be found on the Community Council wiki [1]. You can " +"contact the whole Community council:" +msgstr "" +"社区理事会是 Tor 核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会 Wiki [1] " +"上找到。您可以联系整个社区理事会：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:203 +msgid "if you have questions or concerns about the code of conduct, or" +msgstr "如果您有任何有关此行为准则的问题或关切，或者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:205 +msgid "if you feel that you have witnessed a code of conduct violation" +msgstr "如果您认为自己目睹了违反行为准则的行为" + +#. type: Plain text +#: ../code_of_conduct.txt:212 +msgid "" +"However, if you feel that there is a conflict of interest with any council " +"member, you may contact members individually. Council members' GPG keys are " +"listed on the Community Council wiki. If there is a conflict of interest, " +"the affected council member will recuse themselves. They will not be " +"involved in any discussion or documentation of the incident. More about the " +"Community Council can be found in the guidelines [2]." +msgstr "" +"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员 Wiki 上列出了理事会成员的 GPG " +"密钥。如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南 [2]。" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" +"6. 如果您看到不可接受的行为时该怎么办\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:230 +msgid "" +"If you are subject to or witness unacceptable behavior, or have any other " +"concerns, please notify the Community Council as soon as possible. You can " +"contact the community council in person, or at tor-community-" +"council(a)lists.torproject.org. Current councilmembers are listed on the wiki " +"[1]. The Community Council's incident response will vary on a case-by-case " +"basis. The council will make every effort to respond to the incident " +"immediately. The council will prioritize the safety of the person who has " +"been harmed, or is at risk of harm. Person(s) who have been harmed or are at" +" risk of harm can withdraw the incident report at any time. We will never do" +" anything without the consent of the person who has been harmed or is at " +"risk of harm, except in situations where there is a threat of imminent " +"danger or harm to anyone. More information about the Community Council's " +"incident reporting and response policies can be found on their wiki [1]." +msgstr "" +"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至 tor-" +"community-council(a)lists.torproject.org.Wiki 上列出了当前的理事会成员 " +"[1]。社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。受到伤害或有受到伤害危险的人可以随时撤回事件报告。未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。有关社区委员会的事件报告和响应政策的更多信息，请参见其" +" Wiki [1]。" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" +"7. 违规事件的检举者会得到什么样的反馈\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:242 +msgid "" +"The Community Council prioritizes the safety and well-being of any person " +"who feels that they have been harmed or may be in danger of being harmed. " +"Anyone reporting an issue to the Community Council can expect that their " +"report will be taken seriously. Initial reports can be taken in written or " +"verbal form. If the incident does not require an immediate resolution, then " +"a written report can be shared with the Community Council in an encrypted " +"format. The next steps in an incident response will vary on a case-by-case " +"basis." +msgstr "" +"社区理事会优先考虑任何认为自己受到伤害或可能受到伤害的人的安全和利益。向社区委员会报告问题的任何人都可以确定他们的报告将得到认真对待。初次报告可以书面或口头形式进行。如果事件不需要立即解决，则可以书面形式与社区委员会共享加密格式的报告。事件响应的后续步骤将视情况而定。" + +#. type: Plain text +#: ../code_of_conduct.txt:245 +#, no-wrap +msgid "" +"8. How the Community Council responds to incidents\n" +"============================================================\n" +msgstr "" +"8. 社区理事会如何回应事件\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:252 +msgid "" +"If a community member engages in unacceptable behavior, the Community " +"Council may take any action they deem appropriate, including but not limited" +" to a warning, informal mediation, temporary ban or permanent expulsion from" +" the community. Any actions and decisions by the Community Council may be " +"appealed by following the appeals process in the Community Council " +"Guidelines [1]." +msgstr "" +"如果社区成员进行了任何不可接受的行为，社区理事会可采取他们认为适当的任何行动，包括但不限于警告，非正式调解，临时禁止或永久驱逐社区。遵循社区委员会准则[1]中的上诉程序，可以对社区委员会的任何行动和决定提出上诉。" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" +"9.本文件的范围\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:258 +msgid "This code of conduct covers all community participants:" +msgstr "该行为准则覆盖所有社区参与者：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:260 +msgid "paid and unpaid contributors" +msgstr "有偿和无偿贡献者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:262 +msgid "sponsors" +msgstr "赞助者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:264 +msgid "other guests" +msgstr "其他贵宾" + +#. type: Plain text +#: ../code_of_conduct.txt:266 +msgid "when interacting:" +msgstr "何时互动：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:268 +msgid "in all online and in-person community venues" +msgstr "在所有在线和面对面的社区场所" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:270 +msgid "in one-on-one communications that relate to community work" +msgstr "与社区工作有关的一对一交流" + +#. type: Plain text +#: ../code_of_conduct.txt:277 +msgid "" +"This code of conduct and its related procedures also applies to unacceptable" +" behavior occurring outside the scope of community activities when such " +"behavior has the potential to adversely affect the safety and well-being of " +"community members. As members of the Tor community, we support and follow " +"this Code while we are working on Tor, and take care not to undermine it in " +"the rest of our time." +msgstr "" +"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。作为 Tor " +"社区的成员，我们在致力于 Tor 的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" + +#. type: Plain text +#: ../code_of_conduct.txt:280 +#, no-wrap +msgid "" +"10. License and attribution\n" +"============================================================\n" +msgstr "" +"10. 许可证与归属权\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:284 +msgid "" +"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " +"International license." +msgstr "这份行为准则在知识共享 CC-BY-SA 4.0 国际准则下共享。" + +#. type: Plain text +#: ../code_of_conduct.txt:287 +msgid "" +"This code of conduct uses some language and framing from the Citizen Code of" +" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" +msgstr "" +"该行为准则使用了《公民行为准则》中的某些语言和框架，该行为准则是根据 CC-BY-SA 许可共享的：citizencodeofconduct.org" + +#. type: Plain text +#: ../code_of_conduct.txt:289 +msgid "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…" +msgstr "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…"

1 0

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

09 Oct '19

commit 7df325b1c203d10c6cdaba74c1532895977eaa96 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 02:16:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+zh_CN.po | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/code_of_conduct+zh_CN.po b/code_of_conduct+zh_CN.po index 941b0b0e4..4959ae564 100644 --- a/code_of_conduct+zh_CN.po +++ b/code_of_conduct+zh_CN.po @@ -88,13 +88,13 @@ msgid "" "0. Summary: Don't be a jerk. Be awesome instead.\n" "============================================================\n" msgstr "" -"0. 概述：不要成为混蛋。成为一个优秀的人。\n" +"0. 概述：不要成为垃圾人。做一个优秀的人。\n" "============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:29 msgid "The Tor community should be a good place where people are glad to be." -msgstr "Tor社区应该是人们乐于驻足停留的好地方。" +msgstr "Tor 社区应该是人们乐于驻足停留的好地方。" #. type: Plain text #: ../code_of_conduct.txt:31 @@ -182,7 +182,8 @@ msgid "" "socioeconomic status, body size, race, ethnicity, age, religion, " "nationality, or membership in a disadvantaged and/or underrepresented group." msgstr "" -"Tor社区的主要目标是包容许多不同的贡献者。我们希望包括来自不同背景的贡献者。因此，我们致力于为所有人提供友好，安全和热情的环境，无论他们的经验，性别认同或表达方式，性取向，家庭，人际关系，能力（无论是身体还是精神上），个人面貌，社会经济地位，身材，种族，年龄，宗教，国籍或弱势群体成员的身份。" +"Tor " +"社区的主要目标是包容许多不同的贡献者。我们希望包括来自不同背景的贡献者。因此，我们致力于为所有人提供友好，安全和热情的环境，无论他们的经验、性别认同或表达方式、性取向、家庭、人际关系、能力（无论是身体还是精神上）、个人面貌、社会经济地位、身材、种族、年龄、宗教、国籍或弱势群体成员的身份。" #. type: Plain text #: ../code_of_conduct.txt:68 @@ -206,7 +207,7 @@ msgstr "该行为准则概述了我们对所有参与我们社区的人们的期 msgid "" "We invite all those who participate in The Tor Project to help us create " "safe and positive experiences for everyone." -msgstr "我们邀请所有参与Tor项目的人员帮助我们为每个人创造安全，积极的体验。" +msgstr "我们邀请所有参与 Tor 项目的人员帮助我们为每个人创造安全，积极的体验。" #. type: Plain text #: ../code_of_conduct.txt:77 @@ -267,7 +268,7 @@ msgstr "遭遇危险的人" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:98 msgid "violations of this code of conduct, even if they seem minor" -msgstr "违反本行为准则，即使它们看上去似乎时小事" +msgstr "违反本行为准则，即使它们看上去似乎是小事" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:101 @@ -303,14 +304,14 @@ msgid "" "against another person, especially violence against a person or group based " "on a protected characteristic. (Display of weapons may constitute " "intimidation or a threat of violence.)" -msgstr "暴力，性侵犯，暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" +msgstr "暴力、性侵犯、暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:117 msgid "" "Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" " jokes and language." -msgstr "性别歧视，种族歧视，仇视同性恋，仇视恐怖，能力歧视或其他歧视性笑话和语言。" +msgstr "性别歧视、种族歧视、仇视同性恋、仇视恐怖、能力歧视或其他歧视性笑话和语言。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:122 @@ -318,7 +319,7 @@ msgid "" "Spontaneously posting or displaying sexually explicit or violent material. " "(If it is necessary to share such material when working on Tor's mission, do" " so with sensitivity. Be aware that many people don't want to see it.)" -msgstr "自发发布露骨或暴力的内容。（如果在执行Tor的任务时有必要共享此类材料，请谨慎地进行。请注意，很多人都不想看到此类内容。）" +msgstr "自发地发布露骨或暴力的内容。（如果在执行 Tor 的任务时有必要共享此类材料，请谨慎地进行。请注意，很多人都不想看到此类内容。）" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:125 @@ -335,7 +336,7 @@ msgstr "人身侮辱或攻击，尤其是与以下方面有关的：" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:129 msgid "experience" -msgstr "经验" +msgstr "经历与经验" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:131 @@ -360,12 +361,12 @@ msgstr "关系" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:139 msgid "ability (whether bodily or mental)" -msgstr "能力（心里与生理）" +msgstr "能力（心理与生理）" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:141 msgid "personal appearance" -msgstr "个人外表" +msgstr "个人外貌" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:143 @@ -413,7 +414,7 @@ msgid "" "Inappropriate photography, audio recording, or recording of personal " "information. You should have someone's consent before recording these " "things, and before posting them publicly." -msgstr "不适当的摄影，录音或个人信息记录。在记录这些东西之前以及在公开发布它们之前，您应该获得某人的同意。" +msgstr "不适当的录像、录音或个人信息记录。在记录这些东西之前以及在公开发布它们之前，您应该获得某人的同意。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:164 @@ -427,12 +428,12 @@ msgstr "不当的物理接触。您必须先征得他人的同意，然后再与 msgid "" "Unwelcome sexual attention: this includes sexualized comments or jokes, " "inappropriate touching, groping, and unwelcome sexual advances." -msgstr "不欢迎性关注：这包括有关于性的评论或笑话，不适当的抚摸，摸索和不受欢迎的性行为。" +msgstr "不欢迎的性关注：这包括有关于性的评论或笑话，不适当的抚摸，摸索和不受欢迎的性行为。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:169 msgid "Deliberate intimidation, stalking or following (online or in person)." -msgstr "故意恐吓或跟踪（在线或线下）。" +msgstr "故意恐吓或跟踪（线上或线下）。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:172 @@ -502,8 +503,8 @@ msgid "" "and information can be found on the Community Council wiki [1]. You can " "contact the whole Community council:" msgstr "" -"社区理事会是Tor核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会Wiki " -"[1]上找到。您可以联系整个社区理事会：" +"社区理事会是 Tor 核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会 Wiki [1] " +"上找到。您可以联系整个社区理事会：" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:203 @@ -525,7 +526,8 @@ msgid "" "involved in any discussion or documentation of the incident. More about the " "Community Council can be found in the guidelines [2]." msgstr "" -"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员Wiki上列出了理事会成员的GPG密钥。如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南[2]。" +"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员 Wiki 上列出了理事会成员的 GPG " +"密钥。如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南 [2]。" #. type: Plain text #: ../code_of_conduct.txt:215 @@ -554,10 +556,10 @@ msgid "" "danger or harm to anyone. More information about the Community Council's " "incident reporting and response policies can be found on their wiki [1]." msgstr "" -"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至tor-" -"community-" -"council@lists.torproject.org。Wiki上列出了当前的理事会成员[1]。社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。受到伤害或有受到伤害危险的人可以随时撤回事件报告。未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。有关社区委员会的事件报告和响应政策的更多信息，请参见其Wiki" -" [1]。" +"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至 tor-" +"community-council(a)lists.torproject.org.Wiki 上列出了当前的理事会成员 " +"[1]。社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。受到伤害或有受到伤害危险的人可以随时撤回事件报告。未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。有关社区委员会的事件报告和响应政策的更多信息，请参见其" +" Wiki [1]。" #. type: Plain text #: ../code_of_conduct.txt:233 @@ -660,7 +662,8 @@ msgid "" "this Code while we are working on Tor, and take care not to undermine it in " "the rest of our time." msgstr "" -"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。作为Tor社区的成员，我们在致力于Tor的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" +"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。作为 Tor " +"社区的成员，我们在致力于 Tor 的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" #. type: Plain text #: ../code_of_conduct.txt:280 @@ -677,7 +680,7 @@ msgstr "" msgid "" "This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " "International license." -msgstr "这份行为准则在Creative Commons CC-BY-SA 4.0 国际准则下共享。" +msgstr "这份行为准则在知识共享 CC-BY-SA 4.0 国际准则下共享。" #. type: Plain text #: ../code_of_conduct.txt:287 @@ -685,7 +688,7 @@ msgid "" "This code of conduct uses some language and framing from the Citizen Code of" " Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" msgstr "" -"该行为准则使用了《公民行为准则》中的某些语言和框架，该行为准则是根据CC-BY-SA许可共享的：citizencodeofconduct.org" +"该行为准则使用了《公民行为准则》中的某些语言和框架，该行为准则是根据 CC-BY-SA 许可共享的：citizencodeofconduct.org" #. type: Plain text #: ../code_of_conduct.txt:289

1 0

[translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 2fe09334d798184dd8012fafc0307b668e87ea76 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 01:47:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- zh_CN/index.html | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/zh_CN/index.html b/zh_CN/index.html index 9950e4ca0..94dccdad8 100644 --- a/zh_CN/index.html +++ b/zh_CN/index.html @@ -27,32 +27,28 @@ <p>如果您的互联网访问并<strong>不</strong>受到审查，你可以考虑安装 Snowflake 拓展来帮助那些身陷审查网络中的用户。无需担心人们通过您的代理访问哪些网站。他们可见的 IP 地址是他们的 Tor 出口节点的 IP 地址，而不是您的。</p> <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Install in Firefox</span> + <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>在 Firefox 中安装</span> </a> <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Install in Chrome</span> + <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>在 Chrome 中安装</span> </a></p> </section> </div> <section id="bugs"><h2>报告漏洞</h2> - <p>If you encounter problems with Snowflake as a client or a proxy, - please consider filing a bug. To do so, you will have to,</p> + <p>如果您在使用 Snowflake 的客户端或者代理时， + 请考虑提交漏洞。为此，您将需要，</p> <ol> -<li>Either <a href="https://trac.torproject.org/projects/tor/register">create an - account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> - using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> +<li> <a href="https://trac.torproject.org/projects/tor/register">创建一个 + 账户</a> 或 <a href="https://trac.torproject.org/projects/tor/login">登录</a> + 使用共享的<b>cypherpunks</b> 账户并使用密码 <b>writecode</b>。</li> <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> - using our bug tracker.</li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">填写工单</a> + 使用我们的漏洞追踪器。</li> </ol> -<p>Please try to be as descriptive as possible with your ticket and if - possible include log messages that will help us reproduce the bug. - Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> - to let us know how which part of the Snowflake system is experiencing - problems.</p> +<p>请尽量描述您的情况，如果可能，请同时报告您的日志文件，这将帮助我们重现漏洞。考虑添加关键词 <em>snowflake-webextension</em> 或者 <em>snowflake-client</em> 来让我们知道您在 Snowflake 系统的哪个部分中遇到了问题。</p> </section><section id="embed"><h2>嵌入</h2> <p>现在可以在任何网站上嵌入 Snowflake 徽章：</p>

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 5ee248b98c3e6e138266f62257c25edae1dcd9ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 01:47:13 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- zh_CN/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/index.html b/zh_CN/index.html index 0f66d2036..94dccdad8 100644 --- a/zh_CN/index.html +++ b/zh_CN/index.html @@ -27,23 +27,23 @@ <p>如果您的互联网访问并<strong>不</strong>受到审查，你可以考虑安装 Snowflake 拓展来帮助那些身陷审查网络中的用户。无需担心人们通过您的代理访问哪些网站。他们可见的 IP 地址是他们的 Tor 出口节点的 IP 地址，而不是您的。</p> <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>在Firefox中安装</span> + <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>在 Firefox 中安装</span> </a> <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>在Chrome中安装</span> + <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>在 Chrome 中安装</span> </a></p> </section> </div> <section id="bugs"><h2>报告漏洞</h2> - <p>如果您在使用Snowflake的客户端或者代理时， + <p>如果您在使用 Snowflake 的客户端或者代理时，请考虑提交漏洞。为此，您将需要，</p> <ol> <li> <a href="https://trac.torproject.org/projects/tor/register">创建一个账户</a> 或 <a href="https://trac.torproject.org/projects/tor/login">登录</a> - 使用共享的<b>cypherpunks</b> 账户使用密码 <b>writecode</b>.</li> + 使用共享的<b>cypherpunks</b> 账户并使用密码 <b>writecode</b>。</li> <li> <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">填写工单</a> 使用我们的漏洞追踪器。</li>

1 0

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

09 Oct '19

commit 7165c81b6eae83bb2adf36eabfaa0d0842e2afd3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 01:46:55 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+zh_CN.po | 65 ++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/code_of_conduct+zh_CN.po b/code_of_conduct+zh_CN.po index 843c9665d..941b0b0e4 100644 --- a/code_of_conduct+zh_CN.po +++ b/code_of_conduct+zh_CN.po @@ -6,8 +6,8 @@ # # Translators: # ciaran <ciaranchen(a)qq.com>, 2019 -# ff98sha, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 +# ff98sha, 2019 # #, fuzzy msgid "" @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 2019\n" +"Last-Translator: ff98sha, 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" @@ -55,7 +55,7 @@ msgid "" "The Tor Project is committed to fostering an inclusive environment and " "community. Tor is a place where people should feel safe to engage, share " "their point of view, and participate." -msgstr "Tor 项目致力于营造一个包容性的社区环境。 Tor 应该是人们可以放心参与，分享观点的地方。" +msgstr "Tor 项目致力于营造一个包容性的社区环境。Tor 应该是人们可以放心参与，分享观点的地方。" #. type: Plain text #: ../code_of_conduct.txt:15 @@ -65,8 +65,8 @@ msgid "" " Project, Inc. (TPI) are also subject to company policies and procedures. " "Those people should feel free to contact HR with questions or concerns." msgstr "" -"该行为准则适用于整个Tor 项目。它旨在为贡献者提供指导。 The Tor Project，Inc.（TPI）的员工和承包商也受公司政策和程序的约束。" -" 人们可以随时联系人力资源部以提出问题或疑虑。" +"该行为准则适用于整个Tor 项目。它旨在为贡献者提供指导。The Tor Project, " +"Inc.（TPI）的员工和承包商也受公司政策和程序的约束。人们可以随时联系人力资源部以提出问题或疑虑。" #. type: Plain text #: ../code_of_conduct.txt:23 @@ -79,9 +79,7 @@ msgid "" "values. We understand that keeping a living document relevant and “patched” " "involves sustained effort." msgstr "" -"本行为准则并不详尽或完整。总结我们的共识是一项持续的工作。我们希望提供一个温馨，安全的环境，因此我们共同努力，寻求有力的解决方案。 " -"我们保留弹性执行此代码的权利。任何特例都必须产生更公平的结果，并与我们的价值观保持一致。 " -"我们理解保持活动文档的相关性并对其进行“修补”需要持续的努力。" +"本行为准则并不详尽或完整。总结我们的共识是一项持续的工作。我们希望提供一个温馨，安全的环境，因此我们共同努力，寻求有力的解决方案。我们保留弹性执行此代码的权利。任何特例都必须产生更公平的结果，并与我们的价值观保持一致。我们理解保持活动文档的相关性并对其进行“修补”需要持续的努力。" #. type: Plain text #: ../code_of_conduct.txt:26 @@ -184,8 +182,7 @@ msgid "" "socioeconomic status, body size, race, ethnicity, age, religion, " "nationality, or membership in a disadvantaged and/or underrepresented group." msgstr "" -"Tor社区的主要目标是包容许多不同的贡献者。我们希望包括来自不同背景的贡献者。 " -"因此，我们致力于为所有人提供友好，安全和热情的环境，无论他们的经验，性别认同或表达方式，性取向，家庭，人际关系，能力（无论是身体还是精神上），个人面貌，社会经济地位，身材，种族，年龄，宗教，国籍或弱势群体成员的身份。" +"Tor社区的主要目标是包容许多不同的贡献者。我们希望包括来自不同背景的贡献者。因此，我们致力于为所有人提供友好，安全和热情的环境，无论他们的经验，性别认同或表达方式，性取向，家庭，人际关系，能力（无论是身体还是精神上），个人面貌，社会经济地位，身材，种族，年龄，宗教，国籍或弱势群体成员的身份。" #. type: Plain text #: ../code_of_conduct.txt:68 @@ -195,8 +192,7 @@ msgid "" "Allowing abusers and malicious people to disrupt our community puts our " "software, developers, and users at risk." msgstr "" -"一个安全的环境意味着一个不受虐待的环境，无论是孤立的还是系统的。我们明确承认容忍滥用是一个安全问题。 " -"允许滥用者和恶意人员破坏我们的社区会使我们的软件，开发人员和用户面临风险。" +"一个安全的环境意味着一个不受虐待的环境，无论是孤立的还是系统的。我们明确承认容忍滥用是一个安全问题。允许滥用者和恶意人员破坏我们的社区会使我们的软件，开发人员和用户面临风险。" #. type: Plain text #: ../code_of_conduct.txt:71 @@ -233,7 +229,7 @@ msgstr "所有社区成员都被期望与请求实行下行为：" msgid "" "Participate in an honest and active way. In doing so, you contribute to the " "health and longevity of this community." -msgstr "以诚实和积极的方式参与社区活动。这样，您可以为这个社区的健康和持续发展做出贡献。" +msgstr "以诚实和积极的方式参与社区活动。这样，您可以为这个社区的健康和持续发展做出贡献。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:85 @@ -256,7 +252,7 @@ msgstr "避免贬低，歧视或骚扰的行为和言论。" msgid "" "Be mindful of your surroundings and of your fellow participants. Alert " "community leaders if you notice:" -msgstr "注意周围的环境和参与者。如果您发现以下情况，请通知社区领导人：" +msgstr "注意周围的环境和参与者。如果您发现以下情况，请通知社区领导人：" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:94 @@ -278,7 +274,7 @@ msgstr "违反本行为准则，即使它们看上去似乎时小事" msgid "" "Remember that community event venues may be shared with members of the " "public. Please be respectful to everyone using these locations." -msgstr "请记住，社区活动场所可能会与公众共享。请尊重使用这些场所的每个人。" +msgstr "请记住，社区活动场所可能会与公众共享。请尊重使用这些场所的每个人。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:103 @@ -307,7 +303,7 @@ msgid "" "against another person, especially violence against a person or group based " "on a protected characteristic. (Display of weapons may constitute " "intimidation or a threat of violence.)" -msgstr "暴力，性侵犯，暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" +msgstr "暴力，性侵犯，暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:117 @@ -322,7 +318,7 @@ msgid "" "Spontaneously posting or displaying sexually explicit or violent material. " "(If it is necessary to share such material when working on Tor's mission, do" " so with sensitivity. Be aware that many people don't want to see it.)" -msgstr "自发发布露骨或暴力的内容。（如果在执行Tor的任务时有必要共享此类材料，请谨慎地进行。请注意，很多人都不想看到此类内容。）" +msgstr "自发发布露骨或暴力的内容。（如果在执行Tor的任务时有必要共享此类材料，请谨慎地进行。请注意，很多人都不想看到此类内容。）" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:125 @@ -417,14 +413,14 @@ msgid "" "Inappropriate photography, audio recording, or recording of personal " "information. You should have someone's consent before recording these " "things, and before posting them publicly." -msgstr "不适当的摄影，录音或个人信息记录。在记录这些东西之前以及在公开发布它们之前，您应该获得某人的同意。" +msgstr "不适当的摄影，录音或个人信息记录。在记录这些东西之前以及在公开发布它们之前，您应该获得某人的同意。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:164 msgid "" "Inappropriate physical contact. You should have someone’s consent before " "touching them." -msgstr "不当的物理接触。您必须先征得他人的同意，然后再与他们接触。" +msgstr "不当的物理接触。您必须先征得他人的同意，然后再与他们接触。" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:167 @@ -478,8 +474,7 @@ msgid "" "will not make exceptions for sponsors and those with decision-making " "authority. People in formal or informal leadership roles must model the " "highest standards of behavior." -msgstr "" -"我们不会容忍任何社区成员的不可接受的行为。我们对那些有/无决策权的赞助商也不会例外。担任正式或非正式领导职务的人必须树立最高的行为标准。" +msgstr "我们不会容忍任何社区成员的不可接受的行为。我们对那些有/无决策权的赞助商也不会例外。担任正式或非正式领导职务的人必须树立最高的行为标准。" #. type: Plain text #: ../code_of_conduct.txt:192 @@ -487,7 +482,7 @@ msgid "" "Anyone asked by another community member to stop unacceptable behavior is " "expected to comply immediately. Please don't step in on someone else's " "behalf without their consent." -msgstr "任何来自其他社区成员的要求停止不可接受行为的请求都应立即被遵守。未经他人同意，请勿代表他人介入。" +msgstr "任何来自其他社区成员的要求停止不可接受行为的请求都应立即被遵守。未经他人同意，请勿代表他人介入。" #. type: Plain text #: ../code_of_conduct.txt:195 @@ -507,8 +502,8 @@ msgid "" "and information can be found on the Community Council wiki [1]. You can " "contact the whole Community council:" msgstr "" -"社区理事会是Tor核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会Wiki [1]上找到。 " -"您可以联系整个社区理事会：" +"社区理事会是Tor核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会Wiki " +"[1]上找到。您可以联系整个社区理事会：" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:203 @@ -530,8 +525,7 @@ msgid "" "involved in any discussion or documentation of the incident. More about the " "Community Council can be found in the guidelines [2]." msgstr "" -"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员Wiki上列出了理事会成员的GPG密钥。 " -"如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南[2]。" +"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员Wiki上列出了理事会成员的GPG密钥。如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南[2]。" #. type: Plain text #: ../code_of_conduct.txt:215 @@ -560,12 +554,10 @@ msgid "" "danger or harm to anyone. More information about the Community Council's " "incident reporting and response policies can be found on their wiki [1]." msgstr "" -"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至tor-" -"community-council(a)lists.torproject.org. Wiki上列出了当前的理事会成员[1]。 " -"社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。 " -"受到伤害或有受到伤害危险的人可以随时撤回事件报告。 " -"未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。 " -"有关社区委员会的事件报告和响应政策的更多信息，请参见其Wiki [1]。" +"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至tor-" +"community-" +"council@lists.torproject.org。Wiki上列出了当前的理事会成员[1]。社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。受到伤害或有受到伤害危险的人可以随时撤回事件报告。未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。有关社区委员会的事件报告和响应政策的更多信息，请参见其Wiki" +" [1]。" #. type: Plain text #: ../code_of_conduct.txt:233 @@ -589,8 +581,7 @@ msgid "" "format. The next steps in an incident response will vary on a case-by-case " "basis." msgstr "" -"社区理事会优先考虑任何认为自己受到伤害或可能受到伤害的人的安全和利益。向社区委员会报告问题的任何人都可以确定他们的报告将得到认真对待。 " -"初次报告可以书面或口头形式进行。如果事件不需要立即解决，则可以书面形式与社区委员会共享加密格式的报告。事件响应的后续步骤将视情况而定。" +"社区理事会优先考虑任何认为自己受到伤害或可能受到伤害的人的安全和利益。向社区委员会报告问题的任何人都可以确定他们的报告将得到认真对待。初次报告可以书面或口头形式进行。如果事件不需要立即解决，则可以书面形式与社区委员会共享加密格式的报告。事件响应的后续步骤将视情况而定。" #. type: Plain text #: ../code_of_conduct.txt:245 @@ -612,8 +603,7 @@ msgid "" "appealed by following the appeals process in the Community Council " "Guidelines [1]." msgstr "" -"如果社区成员进行了任何不可接受的行为，社区理事会可采取他们认为适当的任何行动，包括但不限于警告，非正式调解，临时禁止或永久驱逐社区。 " -"遵循社区委员会准则[1]中的上诉程序，可以对社区委员会的任何行动和决定提出上诉。" +"如果社区成员进行了任何不可接受的行为，社区理事会可采取他们认为适当的任何行动，包括但不限于警告，非正式调解，临时禁止或永久驱逐社区。遵循社区委员会准则[1]中的上诉程序，可以对社区委员会的任何行动和决定提出上诉。" #. type: Plain text #: ../code_of_conduct.txt:255 @@ -670,8 +660,7 @@ msgid "" "this Code while we are working on Tor, and take care not to undermine it in " "the rest of our time." msgstr "" -"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。 " -"作为Tor社区的成员，我们在致力于Tor的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" +"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。作为Tor社区的成员，我们在致力于Tor的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" #. type: Plain text #: ../code_of_conduct.txt:280

1 0