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

[community/develop] Fix issue #82, subpage should be discoverable
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 97e63d6fe56a9ad7bc96864eed2fe62d9387076e Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:07:00 2019 +0200 Fix issue #82, subpage should be discoverable --- .../relay-operations/technical-setup/guard/fedora/updates/contents.lr | 4 +--- .../technical-setup/guard/freebsd/updates/contents.lr | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay-… [View More]

1 0

[community/develop] Add color to pages in relay guide
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 888f513552e6c9584bea2b8e00bbfd06572a99c7 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:11:08 2019 +0200 Add color to pages in relay guide --- .../technical-setup/guard/centosrhel/contents.lr | 2 ++ .../technical-setup/guard/centosrhel/updates/contents.lr | 4 +++- .../technical-setup/guard/debianubuntu/contents.lr | 2 ++ .../technical-setup/guard/debianubuntu/updates/contents.lr | 10 ++++++---- .../relay-operations/… [View More]technical-setup/guard/fedora/contents.lr | 4 +++- .../technical-setup/guard/fedora/updates/contents.lr | 2 ++ .../relay-operations/technical-setup/guard/freebsd/contents.lr | 6 ++++-- .../technical-setup/guard/freebsd/updates/contents.lr | 2 ++ 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr index 18eb67a..6914e5b 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: CentOS/RHEL --- body: diff --git a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr index 543587d..24adef4 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: RPM Distributions --- body: @@ -46,7 +48,7 @@ Enable the following settings: Interval: Daily Skip Interactive Patches Agree with Licenses - Use delta rpms + Use delta rpms ``` Confirm your configuration with OK. diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index f203181..20b6619 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian/Ubuntu --- body: diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr index 7053759..0506f6c 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian and Ubuntu --- _discoverable: no @@ -34,10 +36,10 @@ If you want to automatically reboot add the following at the the end of the file Create the file /etc/apt/apt.conf.d/20auto-upgrades with the following content - APT::Periodic::Update-Package-Lists "1"; - APT::Periodic::AutocleanInterval "5"; - APT::Periodic::Unattended-Upgrade "1"; - APT::Periodic::Verbose "1"; + APT::Periodic::Update-Package-Lists "1"; + APT::Periodic::AutocleanInterval "5"; + APT::Periodic::Unattended-Upgrade "1"; + APT::Periodic::Verbose "1"; ``` # 4. Test diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index 0e5f8ac..646fa22 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Fedora --- body: @@ -46,4 +48,4 @@ subtitle: How to deploy a middle/Guard relay on Fedora --- _discoverable: yes --- -_slug: +_slug: diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr index f8195b7..7f31083 100644 --- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr @@ -4,6 +4,8 @@ title: Fedora --- subtitle: --- +color: primary +--- _slug: updates --- diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/contents.lr index 1685fed..9d96639 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: FreeBSD --- body: @@ -47,11 +49,11 @@ service tor start To get package updates faster after they have been build it is best to switch from the "quarterly" with "latest" repository. -Create the following folder: +Create the following folder: `mkdir -p /usr/local/etc/pkg/repos` -and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: +and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: ``` FreeBSD: { enabled: no } diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index ad9959f..86c1638 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: BSD* --- +color: primary +--- _slug: updates --- body: [View Less]

1 0

[community/develop] Fix port number ambiguity and path issue
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit a6a8c35908c2db13d2eaa59d1d54a1319a082dc4 Author: Ken Kundert <thenurd(a)nurdletech.com> Date: Fri Aug 30 12:48:27 2019 -0700 Fix port number ambiguity and path issue When I read this I was stumped for a while by the fact that the same name was used for what I believe should be two different values. TODO was used for both the ORPort and the obfs4 port.. I tried to make it clear that these should be two different ports. Also, you install obfs4 into /usr/local/bin but … [View More]then configured tor to use /usr/bin. Some issues I was unable to resolve: 1. on CentOS Linux release 7.6.1810 I was unable to install obfs4 using 'go get'. go get gitlab.com/yawning/obfs4.git/obfs4proxy # cd .; git clone https://gitlab.com/yawning/utls /tmp/tmp.HMbPtKs8RV/src/gitlab.com/yawning/utls.git error: RPC failed; result=22, HTTP code = 404 fatal: The remote end hung up unexpectedly package gitlab.com/yawning/utls.git: exit status 128 2. On Fedora 30 I was able to install obfs4, but I struggled with selinux. I needed: /sbin/restorecon -v /usr/local/bin/obfs4proxy Relabeled /usr/local/bin/obfs4proxy from system_u:object_r:tor_exec_t:s0 to system_u:object_r:bin_t:s0 and semanage port -a -t tor_port_t -p tcp 4151 to get things working. I suspect your suggested chcon was ill-advised and resulted in the need for me to run restorecon. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 2d232a7..43f3883 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -48,17 +48,18 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor port of your choice. This port must be externally # reachable. Avoid port 9001 because it's commonly associated with Tor and # censors may be scanning the Internet for this port. -ORPort TODO +ORPort TODO1 -ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with # Tor and censors may be scanning the Internet for this port. -ServerTransportListenAddr obfs4 0.0.0.0:TODO +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". # "Ext" means "extended", not "external". Don't try to set a specific port [View Less]

1 0

[community/develop] Fix file path.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 183e81bbda03873177d984463fd56002ac54bad1 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Aug 30 15:49:05 2019 -0700 Fix file path. Thanks to BunnyApocalypse for pointing out this mistake in #tor-relays. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-… [View More]

1 0

[community/develop] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/community
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 3bf61005eb5acb94edfb805f849699c7b5bea4ec Merge: 183e81b 888f513 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Aug 30 15:50:27 2019 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/community .../technical-considerations/contents.lr | 9 --- .../bridge/centos-rhel-opensuse/contents.lr | 14 +++-- .../bridge/debian-ubuntu/contents.lr | 2 + .../technical-setup/bridge/docker/contents.lr | 2 + .../technical-… [View More]

1 0

[community/develop] Added Fedora Instructions
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit ea704abd8de6908876106b4881844f3299a6ae34 Author: Christopher King <bunnyapocalypse(a)protonmail.com> Date: Fri Aug 30 23:55:39 2019 +0000 Added Fedora Instructions So this is what I needed to do in order to get my fedora server up and running as a bridge, and I've added these instructions as if these problems only affect Fedora users, but I would be surprised if that's the case, because the alternative ports that are encouraged in this guide for ORPort and … [View More]ServerTransportListenAddr are exactly what selinux is supposed to stop. Because of that, I'd imagine that this would function the same on CentOS SUSE and RHEL. As for why the fedora instructions install the executable into normal bin, that's because you run into selinux problems there too when it's in /usr/local/bin , but problems that were more complicated than my tiny selinux knowledge can deal with. policycoreutils-python-utils is needed for semanage. --- .../bridge/centos-rhel-opensuse/contents.lr | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 16e12e5..0ecdfc5 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -21,6 +21,12 @@ yum install git golang tor zypper install tor go git ``` +* Fedora: + +``` +dnf install git golang tor policycoreutils-python-utils +``` + ### 2. Build obfs4proxy and move it into place. Heavily outdated versions of git can make `go get` fail, so try upgrading to a more recent git version if you're running into this problem. @@ -42,8 +48,18 @@ go get gitlab.com/yawning/obfs4.git/obfs4proxy sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ ``` +* Fedora: + +``` +export GOPATH=`mktemp -d` +go get gitlab.com/yawning/obfs4.git/obfs4proxy +sudo cp $GOPATH/bin/obfs4proxy /usr/bin/ +``` + ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: +* CentOS / RHEL / OpenSUSE: + ``` RunAsDaemon 1 BridgeRelay 1 @@ -72,6 +88,36 @@ ContactInfo <address(a)email.com> # Pick a nickname that you like for your bridge. This is optional. Nickname PickANickname ``` +* Fedora: + +``` +RunAsDaemon 1 +BridgeRelay 1 + +# Replace "TODO" with a Tor port of your choice. This port must be externally +# reachable. Avoid port 9001 because it's commonly associated with Tor and +# censors may be scanning the Internet for this port. +ORPort TODO + +ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy + +# Replace "TODO" with an obfs4 port of your choice. This port must be +# externally reachable. Avoid port 9001 because it's commonly associated with +# Tor and censors may be scanning the Internet for this port. +ServerTransportListenAddr obfs4 0.0.0.0:TODO + +# Local communication port between Tor and obfs4. Always set this to "auto". +# "Ext" means "extended", not "external". Don't try to set a specific port +# number, nor listen on 0.0.0.0. +ExtORPort auto + +# Replace "<address(a)email.com>" with your email address so we can contact you if +# there are problems with your bridge. This is optional but encouraged. +ContactInfo <address(a)email.com> + +# Pick a nickname that you like for your bridge. This is optional. +Nickname PickANickname +``` Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. @@ -79,8 +125,18 @@ Nickname PickANickname ### 4. Restart tor +* CentOS / RHEL / OpenSUSE: + `systemctl restart tor` +* Fedora: + +``` +sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier] +sudo semanage port -a -t tor_port_t -p tcp [desired ServerTransportListenAddr port number set earlier] +systemctl restart tor +``` + ### 5. Monitor your logs (usually in your syslog) To confirm your bridge is running with no issues, you should see something like this: [View Less]

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 05 Oct '19

05 Oct '19

commit 58bd690b7fea08082eaf846ff19bb617ece07353 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 5 07:22:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-BR.po | 2 +- contents+pt-PT.po | 2 +- contents+tr.po | 2 +- contents+zh-CN.po | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 827f4530d..87e94f9d7 100644 --- a/contents+pt-BR.… [View More]po +++ b/contents+pt-BR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-02 19:24+CET\n" +"POT-Creation-Date: 2019-10-05 09:07+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" "Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 91526bf79..02af170bf 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-02 19:24+CET\n" +"POT-Creation-Date: 2019-10-05 09:07+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" "Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" diff --git a/contents+tr.po b/contents+tr.po index 4e719ea7a..117c2b565 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-02 19:24+CET\n" +"POT-Creation-Date: 2019-10-05 09:07+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" diff --git a/contents+zh-CN.po b/contents+zh-CN.po index d445beb4e..39bc0240b 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-02 19:24+CET\n" +"POT-Creation-Date: 2019-10-05 09:07+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" "Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" [View Less]

1 0

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

05 Oct '19

commit d85a4d8d347f9a92d9bb165622573a7092cc7a74 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 5 07:16:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ka.po | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 687 insertions(+) diff --git a/code_of_conduct+ka.po b/code_of_conduct+ka.po new file mode 100644 index 000000000..f85426326 --- /dev/null +++ b/code_of_conduct+… [View More]ka.po @@ -0,0 +1,687 @@ +# 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: +# Georgianization, 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: Georgianization, 2019\n" +"Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ka\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\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-პროექტისთვის." +" იგი სთავაზობს სახელმძღვანელო პრინციპებს, წვლილის შემომტან მოხალისეებს. " +"თანამშრომლები და Tor Project, Inc. (TPI) დაწესებულების თანამონაწილეები, " +"აგრეთვე ექვემდებარებიან კომპანიის დებულებებსა და განსაზღვრულ წესებს. " +"ნებისმიერ მათგანს შეუძლია დაუკავშირდეს თანამშრომელთა მართვის (HR) სამსახურს," +" კითხვების არსებობის შემთხვევაში." + +#. 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 "" +" უნდა: აქციოთ Tor ადგილად, სადაც ხალხი თავს ბედნიერად და მოხერხებულად " +"იგრძნობს.\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" +" ყველაფრის მცოდნე.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" + +#. 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 "" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" + +#. 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 "" + +#. 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 "" +"ეს ეთიკის კოდექსი ვრცელდება საერთაშორისო ლიცენზიით Creative Commons 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…" [View Less]

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 05 Oct '19

05 Oct '19

commit 9c47d0144e98cbbc267ac2f61f297428c9266011 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 5 07:15:12 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- nl/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 0b0da0607..c32071827 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -22,7 +22,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.… [View More]

1 0

[tpo/master] better strings for l10n
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit eae289674862cc98d82a65c484017c7d2c6d01c6 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Oct 5 08:59:07 2019 +0200 better strings for l10n --- content/about/sponsors/nsf-georgetown/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/about/sponsors/nsf-georgetown/contents.lr b/content/about/sponsors/nsf-georgetown/contents.lr index 12f0ece..90414c5 100644 --- a/content/about/sponsors/nsf-georgetown/contents.lr +++ b/content/about/… [View More]

1 0