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

[translation/communitytpo-contentspot] Update translations for communitytpo-contentspot
by translation＠torproject.org 28 May '19

28 May '19

commit 4daaa4736c02edce15575cded0224ed1d56af619 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 07:15:30 2019 +0000 Update translations for communitytpo-contentspot --- contents+en.po | 24 +++++++++++++----------- contents.pot | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/contents+en.po b/contents+en.po index 6026acfae..12fc91c1c 100644 --- a/contents+en.po +++ b/contents+en.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-27 17:17+CET\n" +"POT-Creation-Date: 2019-05-28 08:47+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -213,24 +213,26 @@ msgstr "Learn how you can help" #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) -msgid "" -"Protecting privacy is what we do at Tor. So how do we collect meaningful " -"user" -msgstr "" -"Protecting privacy is what we do at Tor. So how do we collect meaningful " -"user" +msgid "Protecting privacy is what we do at Tor." +msgstr "Protecting privacy is what we do at Tor." #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) msgid "" -"feedback without violating user consent? We conduct all of our user research" +"So how do we collect meaningful user feedback without violating user " +"consent?" msgstr "" -"feedback without violating user consent? We conduct all of our user research" +"So how do we collect meaningful user feedback without violating user " +"consent?" #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) -msgid "through in-person studies that users explicitly opt into." -msgstr "through in-person studies that users explicitly opt into." +msgid "" +"We conduct all of our user research through in-person studies that users " +"explicitly opt into." +msgstr "" +"We conduct all of our user research through in-person studies that users " +"explicitly opt into." #: https//torproject.org/localization/ #: (content/localization/contents+en.lrpage.title) diff --git a/contents.pot b/contents.pot index 6026acfae..12fc91c1c 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-27 17:17+CET\n" +"POT-Creation-Date: 2019-05-28 08:47+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -213,24 +213,26 @@ msgstr "Learn how you can help" #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) -msgid "" -"Protecting privacy is what we do at Tor. So how do we collect meaningful " -"user" -msgstr "" -"Protecting privacy is what we do at Tor. So how do we collect meaningful " -"user" +msgid "Protecting privacy is what we do at Tor." +msgstr "Protecting privacy is what we do at Tor." #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) msgid "" -"feedback without violating user consent? We conduct all of our user research" +"So how do we collect meaningful user feedback without violating user " +"consent?" msgstr "" -"feedback without violating user consent? We conduct all of our user research" +"So how do we collect meaningful user feedback without violating user " +"consent?" #: https//torproject.org/user-testing/ #: (content/user-testing/contents+en.lrpage.body) -msgid "through in-person studies that users explicitly opt into." -msgstr "through in-person studies that users explicitly opt into." +msgid "" +"We conduct all of our user research through in-person studies that users " +"explicitly opt into." +msgstr "" +"We conduct all of our user research through in-person studies that users " +"explicitly opt into." #: https//torproject.org/localization/ #: (content/localization/contents+en.lrpage.title)

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 67959bb106ac4d37a38330f68f01f038374581f5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 07:15:22 2019 +0000 Update translations for bridgedb_completed --- fa/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 692a7f9a4..5209ad7c0 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2019-05-12 17:54+0000\n" +"PO-Revision-Date: 2019-05-28 07:11+0000\n" "Last-Translator: Reza Ghasemi\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 May '19

28 May '19

commit 8ed975d0a21bb76585c5db4e97884e9a165c9436 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 07:15:15 2019 +0000 Update translations for bridgedb --- fa/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 692a7f9a4..5209ad7c0 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2019-05-12 17:54+0000\n" +"PO-Revision-Date: 2019-05-28 07:11+0000\n" "Last-Translator: Reza Ghasemi\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 337298c0eef1e8cacc256abd8596f6be97794041 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 06:47:50 2019 +0000 Update translations for tba-torbrowserstringsdtd_completed --- zh-CN/torbrowser_strings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd index 58e704596..5a45b80a9 100644 --- a/zh-CN/torbrowser_strings.dtd +++ b/zh-CN/torbrowser_strings.dtd @@ -12,8 +12,8 @@ <!ENTITY firstrun_tornetwork_message "Tor 浏览器将你和世界数千名志愿者支持的 Tor 网络相连。和 VPN 不同的是，这里不会有单点故障，也不需要你为了私密浏览信任某一个中心化的实体。"> <!ENTITY firstrun_tornetwork_next "下一步"> <!ENTITY firstrun_secsettings_tab_title "安全"> -<!ENTITY firstrun_secsettings_title "自定你的浏览体验。"> -<!ENTITY firstrun_secsettings_message "我们也提供更多选项来进一步强化 Tor Browser 的安全性。安全设置可以允许你屏蔽可能会被用于攻击你的电脑的元素。"> +<!ENTITY firstrun_secsettings_title "自定义你的浏览体验。"> +<!ENTITY firstrun_secsettings_message "我们也提供更多选项来进一步强化 Tor 浏览器的安全性。安全设置可以允许你屏蔽可能会被用于攻击你的电脑的元素。"> <!ENTITY firstrun_secsettings_next "下一步"> <!ENTITY firstrun_tips_tab_title "提示"> <!ENTITY firstrun_tips_title "浏览提示"> @@ -32,16 +32,16 @@ <!ENTITY pref_tor_select_a_bridge_title "选择网桥"> <!ENTITY pref_tor_provide_a_bridge_title "添加网桥"> -<!ENTITY pref_category_tor_network_summary "Tor Browser 将您和世界数千名志愿者支持的Tor 网络相连！这些选项可以帮到您吗？"> -<!ENTITY pref_category_tor_bridge_summary "网桥是指未列出的Tor中继，从而使阻止连接Tor网络变得愈加困难。由于一些国家阻止Tor的方式不同，某些网桥在某些国家起效，但在其他国家则不然。"> +<!ENTITY pref_category_tor_network_summary "Tor 浏览器将你和世界数千名志愿者支持的Tor 网络相连！这些选项可以帮到你吗？"> +<!ENTITY pref_category_tor_bridge_summary "网桥是指未列出的 Tor 中继，从而使阻止连接 Tor 网络变得愈加困难。由于一些国家阻止 Tor 的方式不同，某些网桥在某些国家起效，但在其他国家则不然。"> <!ENTITY pref_choice_tor_bridges_enabled_title "我的网络受到审查"> <!ENTITY pref_choice_tor_bridges_enabled_summary "点击配置网桥来连接到 Tor"> -<!ENTITY pref_tor_bridges_provide_manual_button_title "输入获取的网桥"> +<!ENTITY pref_tor_bridges_provide_manual_button_title "输入获取到的网桥"> <!ENTITY pref_tor_bridges_provide_select_text_title "选择网桥"> <!ENTITY pref_tor_bridges_provide_manual_text_title "输入网桥"> -<!ENTITY pref_tor_bridges_provide_manual_summary "输入可信来源提供的网桥："> +<!ENTITY pref_tor_bridges_provide_manual_summary "输入可信来源提供的网桥"> <!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "地址:端口"> <!ENTITY pref_tor_hint_type_one_per_line "每行输入一个">

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 28 May '19

28 May '19

commit 9f9b2f94ad31d3f267566afeadf272d5fb8ccc2f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 06:47:44 2019 +0000 Update translations for tba-torbrowserstringsdtd --- zh-CN/torbrowser_strings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd index 58e704596..5a45b80a9 100644 --- a/zh-CN/torbrowser_strings.dtd +++ b/zh-CN/torbrowser_strings.dtd @@ -12,8 +12,8 @@ <!ENTITY firstrun_tornetwork_message "Tor 浏览器将你和世界数千名志愿者支持的 Tor 网络相连。和 VPN 不同的是，这里不会有单点故障，也不需要你为了私密浏览信任某一个中心化的实体。"> <!ENTITY firstrun_tornetwork_next "下一步"> <!ENTITY firstrun_secsettings_tab_title "安全"> -<!ENTITY firstrun_secsettings_title "自定你的浏览体验。"> -<!ENTITY firstrun_secsettings_message "我们也提供更多选项来进一步强化 Tor Browser 的安全性。安全设置可以允许你屏蔽可能会被用于攻击你的电脑的元素。"> +<!ENTITY firstrun_secsettings_title "自定义你的浏览体验。"> +<!ENTITY firstrun_secsettings_message "我们也提供更多选项来进一步强化 Tor 浏览器的安全性。安全设置可以允许你屏蔽可能会被用于攻击你的电脑的元素。"> <!ENTITY firstrun_secsettings_next "下一步"> <!ENTITY firstrun_tips_tab_title "提示"> <!ENTITY firstrun_tips_title "浏览提示"> @@ -32,16 +32,16 @@ <!ENTITY pref_tor_select_a_bridge_title "选择网桥"> <!ENTITY pref_tor_provide_a_bridge_title "添加网桥"> -<!ENTITY pref_category_tor_network_summary "Tor Browser 将您和世界数千名志愿者支持的Tor 网络相连！这些选项可以帮到您吗？"> -<!ENTITY pref_category_tor_bridge_summary "网桥是指未列出的Tor中继，从而使阻止连接Tor网络变得愈加困难。由于一些国家阻止Tor的方式不同，某些网桥在某些国家起效，但在其他国家则不然。"> +<!ENTITY pref_category_tor_network_summary "Tor 浏览器将你和世界数千名志愿者支持的Tor 网络相连！这些选项可以帮到你吗？"> +<!ENTITY pref_category_tor_bridge_summary "网桥是指未列出的 Tor 中继，从而使阻止连接 Tor 网络变得愈加困难。由于一些国家阻止 Tor 的方式不同，某些网桥在某些国家起效，但在其他国家则不然。"> <!ENTITY pref_choice_tor_bridges_enabled_title "我的网络受到审查"> <!ENTITY pref_choice_tor_bridges_enabled_summary "点击配置网桥来连接到 Tor"> -<!ENTITY pref_tor_bridges_provide_manual_button_title "输入获取的网桥"> +<!ENTITY pref_tor_bridges_provide_manual_button_title "输入获取到的网桥"> <!ENTITY pref_tor_bridges_provide_select_text_title "选择网桥"> <!ENTITY pref_tor_bridges_provide_manual_text_title "输入网桥"> -<!ENTITY pref_tor_bridges_provide_manual_summary "输入可信来源提供的网桥："> +<!ENTITY pref_tor_bridges_provide_manual_summary "输入可信来源提供的网桥"> <!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "地址:端口"> <!ENTITY pref_tor_hint_type_one_per_line "每行输入一个">

1 0

[community/staging] add pt-BR, ru, it
by emmapeel＠torproject.org 28 May '19

28 May '19

commit a852b6efd71dd3af227ad254c0a6963ec14e1b3f Author: emma peel <emma.peel(a)riseup.net> Date: Mon May 27 17:09:02 2019 +0200 add pt-BR, ru, it --- community.lektorproject | 24 ++++++++++++++++++++++-- configs/i18n.ini | 2 +- databags/alternatives.ini | 24 +++++++++++++++++++++--- databags/menu+de.ini | 1 + databags/menu+es.ini | 20 +------------------- databags/menu+fr.ini | 20 +------------------- databags/menu+it.ini | 1 + databags/menu+pt-BR.ini | 1 + databags/menu+ru.ini | 1 + databags/menu_footer+de.ini | 1 + databags/menu_footer+en.ini | 6 +++--- databags/menu_footer+es.ini | 16 +--------------- databags/menu_footer+fr.ini | 16 +--------------- databags/menu_footer+it.ini | 1 + databags/menu_footer+pt-BR.ini | 1 + databags/menu_footer+ru.ini | 1 + databags/pagenav+de.ini | 1 + databags/pagenav+es.ini | 24 +----------------------- databags/pagenav+fr.ini | 24 +----------------------- databags/pagenav+it.ini | 1 + databags/pagenav+pt-BR.ini | 1 + databags/pagenav+ru.ini | 1 + 22 files changed, 65 insertions(+), 123 deletions(-) diff --git a/community.lektorproject b/community.lektorproject index 4fa9aa5..7195f39 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -5,10 +5,15 @@ url_style = relative locale = en_US [alternatives.en] -name = English +name = English (en) primary = yes url_prefix = / -locale = en_US +locale = en + +[alternatives.de] +name = Deutsch (de) +url_prefix = /de/ +locale = de [alternatives.es] name = Español @@ -19,3 +24,18 @@ locale = es name = Français url_prefix = /fr/ locale = fr + +[alternatives.it] +name = Italia (it) +url_prefix = /it/ +locale = it + +[alternatives.pt-BR] +name = Português Br. (pr-BR) +url_prefix = /pt-BR/ +locale = pt-BR + +[alternatives.ru] +name = Русский (ru) +url_prefix = /ru/ +locale = ru diff --git a/configs/i18n.ini b/configs/i18n.ini index d65d25e..cb13961 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,fr +translations = es,de,fr,it,pt-BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = https://torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index d355706..1dafc16 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,11 +4,11 @@ order = order-last url = / language = English (en) -[en-US] +[de] direction = text-left order = order-last -url = /en-US/ -language = English (en) +url = /de/ +language = Deutsch (de) [es] direction = text-left @@ -21,3 +21,21 @@ direction = text-left order = order-last url = /fr/ language = Français (fr) + +[it] +direction = text-left +order = order-last +url = /it/ +language = Italiano (it) + +[pt-BR] +direction = text-left +order = order-last +url = /pt-BR/ +language = Português Br. (pt-BR) + +[ru] +direction = text-left +order = order-last +url = /ru/ +language = Русский (ru) diff --git a/databags/menu+de.ini b/databags/menu+de.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+de.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 100644 index 0daf87f..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = https://www.torproject.org/es/about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/es/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/es -label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+es.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 100644 index c42b133..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = https://www.torproject.org/fr/about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/fr/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/fr -label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+fr.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+it.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+pt-BR.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+ru.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+de.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini index e66659d..b97b531 100644 --- a/databags/menu_footer+en.ini +++ b/databags/menu_footer+en.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/contact label = Contact [press] -path = ttps://www.torproject.org/press +path = https://www.torproject.org/press label = Press diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini deleted file mode 100644 index e66659d..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = ttps://www.torproject.org/about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = ttps://www.torproject.org/contact -label = Contact - -[press] -path = ttps://www.torproject.org/press -label = Press diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+es.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 100644 index e66659d..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = ttps://www.torproject.org/about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = ttps://www.torproject.org/contact -label = Contact - -[press] -path = ttps://www.torproject.org/press -label = Press diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+fr.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+it.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+pt-BR.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+ru.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+de.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini deleted file mode 100644 index 1f4097c..0000000 --- a/databags/pagenav+es.ini +++ /dev/null @@ -1,23 +0,0 @@ -[relay-operations] -path = relay-operations -label = Relay Operations - -[user-testing] -path = user-testing -label = User Testing - -[training] -path = training -label = Training - -[outreach] -path = outreach -label = Outreach - -[localization] -path = localization -label = Localization - -[onion-services] -path = onion-services -label = .Onion Services diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+es.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini deleted file mode 100644 index 1f4097c..0000000 --- a/databags/pagenav+fr.ini +++ /dev/null @@ -1,23 +0,0 @@ -[relay-operations] -path = relay-operations -label = Relay Operations - -[user-testing] -path = user-testing -label = User Testing - -[training] -path = training -label = Training - -[outreach] -path = outreach -label = Outreach - -[localization] -path = localization -label = Localization - -[onion-services] -path = onion-services -label = .Onion Services diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+fr.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+it.ini b/databags/pagenav+it.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+it.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+pt-BR.ini b/databags/pagenav+pt-BR.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+pt-BR.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+ru.ini b/databags/pagenav+ru.ini new file mode 120000 index 0000000..214e4d8 --- /dev/null +++ b/databags/pagenav+ru.ini @@ -0,0 +1 @@ +pagenav+en.ini \ No newline at end of file

1 0

[community/staging] merge master
by emmapeel＠torproject.org 28 May '19

28 May '19

commit c292d43654e5b63c77338aa4dd8103c816823b57 Merge: 492c8a3 eb60871 Author: emma peel <emma.peel(a)riseup.net> Date: Tue May 28 08:33:01 2019 +0200 merge master community.lektorproject | 19 ++- configs/i18n.ini | 2 +- content/relay-operations/contents.lr | 7 +- .../relays-requirements/contents.lr | 80 +++++------ .../technical-setup/centosrhel/contents.lr | 4 + .../relay-operations/technical-setup/contents.lr | 160 ++++++++------------- .../technical-setup/debianubuntu/contents.lr | 2 + .../technical-setup/fedora/contents.lr | 2 + .../technical-setup/freebsd/contents.lr | 2 + databags/alternatives.ini | 20 ++- databags/menu+es.ini | 20 +-- databags/menu+fr.ini | 20 +-- databags/menu+it.ini | 1 + databags/menu+ru.ini | 1 + databags/menu_footer+es.ini | 2 +- databags/menu_footer+it.ini | 1 + databags/menu_footer+ru.ini | 1 + databags/pagenav+de.ini | 12 +- databags/pagenav+es.ini | 24 +--- databags/pagenav+it.ini | 1 + databags/pagenav+ru.ini | 1 + 21 files changed, 158 insertions(+), 224 deletions(-) diff --cc community.lektorproject index 422a406,7195f39..bb88054 --- a/community.lektorproject +++ b/community.lektorproject @@@ -24,10 -8,15 +24,15 @@@ locale = d name = English (en) primary = yes url_prefix = / - locale = en-US + locale = en + + [alternatives.de] + name = Deutsch (de) + url_prefix = /de/ + locale = de [alternatives.es] -name = Español +name = Español (es) url_prefix = /es/ locale = es @@@ -36,17 -25,17 +41,29 @@@ name = Français (fr url_prefix = /fr/ locale = fr + [alternatives.it] + name = Italia (it) + url_prefix = /it/ + locale = it + [alternatives.pt-BR] -name = Português Br. (pr-BR) +name = Português (Brasil) url_prefix = /pt-BR/ locale = pt-BR + [alternatives.ru] + name = Русский (ru) + url_prefix = /ru/ + locale = ru ++ +[alternatives.tr] +name = Türkçe (tr) +url_prefix = /tr/ +locale = tr + +[alternatives.zh-CN] +name = 简体字 (zh-CN) +url_prefix = /zh-CN/ +locale = zh-CN ++ ++ diff --cc configs/i18n.ini index cdc9610,cb13961..436704b --- a/configs/i18n.ini +++ b/configs/i18n.ini @@@ -1,5 -1,5 +1,5 @@@ content = en - translations = ar,bn-BD,de,es,fr,pt-BR,tr,zh-CN -translations = es,de,fr,it,pt-BR,ru ++translations = ar,bn-BD,de,es,fr,it,pt-BR,ru,tr,zh-CN i18npath = i18n translate_paragraphwise = False -url_prefix = https://torproject.org/ +url_prefix = https://lektor-staging.torproject.org/community/staging/ diff --cc databags/alternatives.ini index f36def3,1dafc16..2cce48a --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@@ -4,29 -4,11 +4,29 @@@ order = order-las url = / language = English (en) +[ar] +direction = text-right +order = order-first +url = /ar/ +language = عربية (ar) + +[bn-BD] +direction = text-left +order = order-last +url = /bn-BD/ +language = বাংলা ভাষা (bn) + +[de] +direction = text-left +order = order-last +url = /de/ +language = Deutsch (de) + - [en-US] + [de] direction = text-left order = order-last - url = /en-US/ - language = English (en) + url = /de/ + language = Deutsch (de) [es] direction = text-left @@@ -44,16 -32,10 +50,24 @@@ language = Italiano (it direction = text-left order = order-last url = /pt-BR/ -language = Português Br. (pt-BR) +language = Português (pt-BR) + [ru] + direction = text-left + order = order-last + url = /ru/ + language = Русский (ru) ++ +[tr] +direction = text-left +order = order-last +url = /tr/ +language = Türkçe (tr) + +[zh-CN] +direction = text-left +order = order-last +url = /zh-CN/ +language = 简体字 (zh-CN) ++ ++ diff --cc databags/menu_footer+es.ini index 553ed4a,a3178a1..3a07e3f mode 100644,120000..100644 --- a/databags/menu_footer+es.ini +++ b/databags/menu_footer+es.ini @@@ -1,15 -1,1 +1,15 @@@ -menu_footer+en.ini +[jobs] - path = https://www.torproject.org/about/jobs ++path = https://www.torproject.org/es/about/jobs +label = Jobs + +[blog] +path = https://blog.torproject.org +label = Blog + +[contact] +path = https://www.torproject.org/es/contact +label = Contact + +[press] +path = https://www.torproject.org/es/press +label = Press diff --cc databags/pagenav+de.ini index ee4a217,214e4d8..1ad40f2 mode 100644,120000..100644 --- a/databags/pagenav+de.ini +++ b/databags/pagenav+de.ini @@@ -1,23 -1,1 +1,23 @@@ -pagenav+en.ini +[relay-operations] - path = de/relay-operations ++path = relay-operations +label = Relay Operations + +[user-testing] - path = de/user-testing ++path = user-testing +label = User Testing + +[training] - path = de/training ++path = training +label = Training + +[outreach] - path = de/outreach ++path = outreach +label = Outreach + +[translations] - path = de/translations ++path = translations +label = Translations + +[onion-services] - path = de/onion-services ++path = onion-services +label = .Onion Services

1 0

[community/staging] better strings for l10n
by emmapeel＠torproject.org 28 May '19

28 May '19

commit 821e72b6c7a6c2689fc7f4c58a8ada18fa016fe3 Author: emma peel <emma.peel(a)riseup.net> Date: Mon May 27 15:49:34 2019 +0200 better strings for l10n --- content/relay-operations/contents+en.lr | 30 ---- content/relay-operations/contents+es.lr | 30 ---- content/relay-operations/contents+fr.lr | 30 ---- content/relay-operations/contents.lr | 7 +- .../relays-requirements/contents.lr | 77 ++++------ .../relay-operations/technical-setup/contents.lr | 160 ++++++++------------- 6 files changed, 95 insertions(+), 239 deletions(-) diff --git a/content/relay-operations/contents+en.lr b/content/relay-operations/contents+en.lr deleted file mode 100644 index e96d6c9..0000000 --- a/content/relay-operations/contents+en.lr +++ /dev/null @@ -1,30 +0,0 @@ -section: relay operations ---- -section_id: relay-operations ---- -color: primary ---- -_template: layout.html ---- -title: Relay operations ---- -subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. ---- -cta: Grow the Tor network ---- -key: 1 ---- -html: relay-operations.html ---- -body: - -The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. - -By running a Tor relay you can help make the Tor network: - -* faster (and therefore more usable) -* more robust against attacks -* more stable in case of outages -* safer for its users (spying on more relays is harder than on a few) - -Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents+es.lr b/content/relay-operations/contents+es.lr deleted file mode 100644 index e96d6c9..0000000 --- a/content/relay-operations/contents+es.lr +++ /dev/null @@ -1,30 +0,0 @@ -section: relay operations ---- -section_id: relay-operations ---- -color: primary ---- -_template: layout.html ---- -title: Relay operations ---- -subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. ---- -cta: Grow the Tor network ---- -key: 1 ---- -html: relay-operations.html ---- -body: - -The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. - -By running a Tor relay you can help make the Tor network: - -* faster (and therefore more usable) -* more robust against attacks -* more stable in case of outages -* safer for its users (spying on more relays is harder than on a few) - -Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents+fr.lr b/content/relay-operations/contents+fr.lr deleted file mode 100644 index e96d6c9..0000000 --- a/content/relay-operations/contents+fr.lr +++ /dev/null @@ -1,30 +0,0 @@ -section: relay operations ---- -section_id: relay-operations ---- -color: primary ---- -_template: layout.html ---- -title: Relay operations ---- -subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. ---- -cta: Grow the Tor network ---- -key: 1 ---- -html: relay-operations.html ---- -body: - -The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. - -By running a Tor relay you can help make the Tor network: - -* faster (and therefore more usable) -* more robust against attacks -* more stable in case of outages -* safer for its users (spying on more relays is harder than on a few) - -Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents.lr b/content/relay-operations/contents.lr index e96d6c9..7d28096 100644 --- a/content/relay-operations/contents.lr +++ b/content/relay-operations/contents.lr @@ -18,7 +18,9 @@ html: relay-operations.html --- body: -The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. +The Tor network relies on volunteers to donate bandwidth. +The more people who run relays, the better the Tor network will be. +The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. By running a Tor relay you can help make the Tor network: @@ -27,4 +29,5 @@ By running a Tor relay you can help make the Tor network: * more stable in case of outages * safer for its users (spying on more relays is harder than on a few) -Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. +Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. +The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay-operations/relays-requirements/contents.lr index a4349d1..f00ba88 100644 --- a/content/relay-operations/relays-requirements/contents.lr +++ b/content/relay-operations/relays-requirements/contents.lr @@ -21,48 +21,36 @@ provide. # Bandwidth and Connections -A non-exit relay should be able to handle at least 7000 concurrent -connections. This can overwhelm consumer-level routers. If you run the Tor -relay from a server (virtual or dedicated) in a data center you will be fine. -If you run it behind a consumer-level router at home you will have to try and -see if your home router can handle it or if it starts failing. Fast exit -relays (>=100 Mbit/s) usually have to handle a lot more concurrent connections -(>100k). - -It is recommended that a relay have at least 16 Mbit/s (Mbps) upload bandwidth -and 16 Mbit/s (Mbps) download bandwidth available for Tor. More is better. The -minimum requirements for a relay are 10 Mbit/s (Mbps). If you have less than 10 -Mbit/s but at least 1 Mbit/s we recommend you run a [bridge with obfs4 -support](https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy). -If you do not know your bandwidth you can use http://beta.speedtest.net to -measure it. +A non-exit relay should be able to handle at least 7000 concurrent connections. +This can overwhelm consumer-level routers. If you run the Tor relay from a server (virtual or dedicated) in a data center you will be fine. +If you run it behind a consumer-level router at home you will have to try and see if your home router can handle it or if it starts failing. +Fast exit relays (>=100 Mbit/s) usually have to handle a lot more concurrent connections (>100k). + +It is recommended that a relay have at least 16 Mbit/s (Mbps) upload bandwidth and 16 Mbit/s (Mbps) download bandwidth available for Tor. More is better. +The minimum requirements for a relay are 10 Mbit/s (Mbps). +If you have less than 10 Mbit/s but at least 1 Mbit/s we recommend you run a [bridge with obfs4 support](https://trac.torproject.org/projects/tor/wiki/doc/PluggableTranspo…. +If you do not know your bandwidth you can use http://beta.speedtest.net to measure it. # Monthly Outbound Traffic -It is required that a Tor relay be allowed to use a minimum of 100 GByte of -outbound traffic (and the same amount of incoming traffic) per month. Note: That -is only about 1 day worth of traffic on a 10 Mbit/s (Mbps) connection. More (>2 -TB/month) is better and recommended. **Ideally a relay runs on an unmetered plan** -or includes 20 TB/month or more. If you have a metered plan you might want to -configure tor to only use a given amount of [bandwidth or monthly traffic](FIXME). +It is required that a Tor relay be allowed to use a minimum of 100 GByte of outbound traffic (and the same amount of incoming traffic) per month. +Note: That is only about 1 day worth of traffic on a 10 Mbit/s (Mbps) connection. +More (>2 TB/month) is better and recommended. +**Ideally a relay runs on an unmetered plan** or includes 20 TB/month or more. +If you have a metered plan you might want to configure tor to only use a given amount of [bandwidth or monthly traffic](FIXME). # Public IPv4 Address -Every relay needs a public IPv4 address - either directly on the host -(preferred) or via NAT and port forwarding. +Every relay needs a public IPv4 address - either directly on the host (preferred) or via NAT and port forwarding. -The IPv4 address is not required to be static but static IP addresses are -preferred. Your IPv4 address should remain unchanged for at least 3 hours (if it -regularly changes more often than that, it does not make much sense to run a -relay or bridge there since it takes time to distribute the new list of relay -IPs to clients - which happens only once every hour). +The IPv4 address is not required to be static but static IP addresses are preferred. +Your IPv4 address should remain unchanged for at least 3 hours (if it regularly changes more often than that, it does not make much sense to run a relay or bridge there since it takes time to distribute the new list of relay IPs to clients - which happens only once every hour). -Additional IPv6 connectivity is great and recommended/encouraged but not a -requirement. There should be no problem at all with this requirement (all -commercially available servers come with at least one IPv4 address). +Additional IPv6 connectivity is great and recommended/encouraged but not a requirement. +There should be no problem at all with this requirement (all commercially available servers come with at least one IPv4 address). -Note: You can only run two Tor relays per public IPv4 address. If you want to -run more than two relays you will need more IPv4 addresses. +Note: You can only run two Tor relays per public IPv4 address. +If you want to run more than two relays you will need more IPv4 addresses. # Memory Requirements @@ -72,26 +60,23 @@ run more than two relays you will need more IPv4 addresses. # Disk Storage -Tor does not need much disk storage. A typical Tor relay needs less than 200 MB -for Tor related data (in addition to the operating system itself). +Tor does not need much disk storage. +A typical Tor relay needs less than 200 MB for Tor related data (in addition to the operating system itself). # CPU * Any modern CPU should be fine. -* It is recommended to use CPUs with AESNI support (that will improve performance -and allow for up to about ~400-450 Mbps in each direction on a single tor -instance on modern CPUs). If the file /proc/cpuinfo contains the word aes your -CPU has support for AES-NI. +* It is recommended to use CPUs with AESNI support (that will improve performance and allow for up to about ~400-450 Mbps in each direction on a single tor instance on modern CPUs). + If the file /proc/cpuinfo contains the word aes your CPU has support for AES-NI. # Uptime -Tor has no hard uptime requirement but if your relay is not running for more -than 2 hours a day its usefulness is limited. Ideally the relay runs on a server -which runs 24/7. Reboots and tor daemon restarts are fine. +Tor has no hard uptime requirement but if your relay is not running for more than 2 hours a day its usefulness is limited. +Ideally the relay runs on a server which runs 24/7. +Reboots and tor daemon restarts are fine. # Tor Version -For security reasons, Tor relays should not downgrade their tor version from a -supported to an unsupported version of tor. Some unsupported versions are -insecure. Relays that attempt to downgrade to an insecure version will be -rejected from the network automatically. +For security reasons, Tor relays should not downgrade their tor version from a supported to an unsupported version of tor. +Some unsupported versions are insecure. +Relays that attempt to downgrade to an insecure version will be rejected from the network automatically. diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index 19d60c0..c795b0f 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -4,36 +4,30 @@ section_id: relay-operations --- color: primary --- +key: 3 +--- _template: layout.html --- title: Technical setup --- subtitle: Installing and configuring your Tor relay. --- -key: 3 ---- html: relay-operations.html --- body: # Considerations when choosing a hosting provider -If you have access to a high speed internet connection (>=100 Mbit/s in both -directions) and a physical piece of computer hardware, this is the best way to -run a relay. Having full control over the hardware and connection gives you a -more controllable and (if done correctly) secure environment. You can host your -own physical hardware at home (do NOT run a Tor exit relay from your home) or in -a data center. Sometimes this is referred to as installing the relay on "bare -metal". - -If you do not own physical hardware, you could run a relay on a rented dedicated -server or virtual private server (VPS). This can cost anywhere between -$3.00/month and thousands per month, depending on your provider, hardware -configuration, and bandwidth usage. Many VPS providers will not allow you to run -exit relays. You must follow the VPS provider's terms of service, or risk having -your account disabled. For more information on hosting providers and their -policies on allowing Tor relays, please see this list maintained by the Tor -community: [GoodBadISPs](FIXME). +If you have access to a high speed internet connection (>=100 Mbit/s in both directions) and a physical piece of computer hardware, this is the best way to run a relay. +Having full control over the hardware and connection gives you a more controllable and (if done correctly) secure environment. +You can host your own physical hardware at home (do NOT run a Tor exit relay from your home) or in a data center. +Sometimes this is referred to as installing the relay on "bare metal". + +If you do not own physical hardware, you could run a relay on a rented dedicated server or virtual private server (VPS). +This can cost anywhere between $3.00/month and thousands per month, depending on your provider, hardware configuration, and bandwidth usage. +Many VPS providers will not allow you to run exit relays. +You must follow the VPS provider's terms of service, or risk having your account disabled. +For more information on hosting providers and their policies on allowing Tor relays, please see this list maintained by the Tor community: [GoodBadISPs](FIXME). ## Questions to consider when choosing a hoster @@ -41,71 +35,57 @@ community: [GoodBadISPs](FIXME). * Does the hoster provide IPv6 connectivity? (it is recommended, but not required) * What virtualization / hypervisor (if any) does the provider use? (anything but OpenVZ should be fine) * Does the hoster start to throttle bandwidth after a certain amount of traffic? -* How well connected is the autonomous system of the hoster? To answer this -question you can use the AS rank of the autonomous systems if you want to +* How well connected is the autonomous system of the hoster? To answer this question you can use the AS rank of the autonomous systems if you want to compare: http://as-rank.caida.org/ (a lower value is better) ## If you plan to run Exit Relays -* Does the hoster allow Tor exit relays? (explicitly ask them before starting an -exit relay there) -* Does the hoster allow custom WHOIS records for your IP addresses? This helps -reduce the amount of abuse sent to the hoster instead of you. +* Does the hoster allow Tor exit relays? (explicitly ask them before starting an exit relay there) +* Does the hoster allow custom WHOIS records for your IP addresses? This helps reduce the amount of abuse sent to the hoster instead of you. * Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record) -This are probably things you will need to ask the hoster in a Pre-Sales ticket + This are probably things you will need to ask the hoster in a Pre-Sales ticket # AS/location diversity -When selecting your hosting provider, consider network diversity on an -autonomous system (AS) and country level. A more diverse network is more -resilient to attacks and outages. Sometimes it is not clear which AS you are -buying from in case of resellers. To be sure it is best to ask the hoster about -the AS number before ordering a server. +When selecting your hosting provider, consider network diversity on an autonomous system (AS) and country level. +A more diverse network is more resilient to attacks and outages. +Sometimes it is not clear which AS you are buying from in case of resellers. +To be sure it is best to ask the hoster about the AS number before ordering a server. -It is best to avoid hosters where many Tor relays are already hosted, but it is -still better to add one there than to run no relay at all. **Try to avoid** the -following hoster: +It is best to avoid hosters where many Tor relays are already hosted, but it is still better to add one there than to run no relay at all. + **Try to avoid** the following hosters: * OVH SAS (AS16276) * Online S.a.s. (AS12876) * Hetzner Online GmbH (AS24940) * DigitalOcean, LLC (AS14061) -To find out which hoster and countries are already used by many other operators -(that should be avoided) you can use Relay Search: +To find out which hoster and countries are already used by many other operators (that should be avoided) you can use Relay Search: -* [Autonomous System Level -Overview](https://metrics.torproject.org/rs.html#aggregate/as) +* [Autonomous System Level Overview](https://metrics.torproject.org/rs.html#aggregate/as) * [Country Level Overview](https://metrics.torproject.org/rs.html#aggregate/cc) # Choosing an Operating System -We recommend you use the operating system you are most familiar with. Please -keep in mind that since most relays run on Debian and we want to avoid a -monoculture, BSD and other non-Linux based relays are greatly needed. +We recommend you use the operating system you are most familiar with. +Please keep in mind that since most relays run on Debian and we want to avoid a monoculture, BSD and other non-Linux based relays are greatly needed. -The following table shows the current OS distribution on the Tor network to give -you an idea of how much more non-Linux relays we should have: +The following table shows the current OS distribution on the Tor network to give you an idea of how much more non-Linux relays we should have: * https://nusenu.github.io/OrNetStats/#os-distribution-relays # OS Level Configuration -OS configuration is outside the scope of this guide but the following points are -crucial for a Tor relay, so we want to mention them here nonetheless. +OS configuration is outside the scope of this guide but the following points are crucial for a Tor relay, so we want to mention them here nonetheless. ## Time Synchronization (NTP) -Correct time settings are essential for Tor relays. It is recommended that you -use the network time protocol (NTP) for time synchronization and ensure your -timezone is set correctly. +Correct time settings are essential for Tor relays. It is recommended that you use the network time protocol (NTP) for time synchronization and ensure your timezone is set correctly. ## Automatic Software Updates -One of the most imported things to keeps your relay secure is to install -security updates timely and ideally automatically so you can not forget about -it. We collected the steps to enable automatic software updates for different -operating systems: +One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. +We collected the steps to enable automatic software updates for different operating systems: * [RPM-based distributions](FIXME) (RHEL, CentOS, Fedora, openSUSE) * [Debian/Ubuntu](FIXME) @@ -113,30 +93,24 @@ operating systems: # Tor Relay Setup: Installation and Configuration -This section covers the installation and configuration of the program required -to run a Tor relay for various operating systems. These steps are intended for -the latest stable version of the given OS, on Ubuntu for the latest LTS release. +This section covers the installation and configuration of the program required to run a Tor relay for various operating systems. +These steps are intended for the latest stable version of the given OS, on Ubuntu for the latest LTS release. -Note: For some operating systems, there are alpha version packages available -(tor versions with new features not deemed to be stable yet). These are only -recommended for people eager to test and report bugs in bleeding edge -releases/features. If you are looking to run a relay with minimal effort we -recommend you stick to stable releases. +Note: For some operating systems, there are alpha version packages available (tor versions with new features not deemed to be stable yet). +These are only recommended for people eager to test and report bugs in bleeding edge releases/features. +If you are looking to run a relay with minimal effort we recommend you stick to stable releases. -In this guide we describe how to setup a new non-exit relay. By reading further -you can easily switch to become an exit relay. +In this guide we describe how to setup a new non-exit relay. +By reading further you can easily switch to become an exit relay. **Questions you should clarify before configuring Tor:** * Do you want to run a Tor exit or non-exit (guard/middle) relay? -* If you want to run an exit relay: Which ports do you want to allow in your -exit policy? (more ports usually means potentially more abuse complains) +* If you want to run an exit relay: Which ports do you want to allow in your exit policy? (more ports usually means potentially more abuse complains) * What external TCP port do you want to use for incoming Tor connections? -("ORPort" configuration, we recommend port 443 if that is not used by another -daemon on your server already. ORPort 443 is recommended because it is often one -of the few open ports on public WIFI networks. Port 9001 is another commonly used ORPort.) + ("ORPort" configuration, we recommend port 443 if that is not used by another daemon on your server already. ORPort 443 is recommended because it is often one of the few open ports on public WIFI networks. Port 9001 is another commonly used ORPort.) * What email address will you use in the ContactInfo field of your relay(s)? -Note: This information will be made public. + Note: This information will be made public. * How much bandwidth/monthly traffic do you want to allow for Tor traffic? * Does the server have an IPv6 address? @@ -144,32 +118,21 @@ The installation commands are shown in code blocks and must be executed with roo ## Make sure relay ports can be reached -If you are using a firewall, open a hole in your firewall so incoming -connections can reach the ports you will use for your relay (ORPort, plus -DirPort if you enabled it). Also, make sure you allow all outgoing connections -too, so your relay can reach the other Tor relays, clients and destinations. You -can find the specific ORPort TCP port number in the torrc configuration samples -bellow (in the OS specific sections). +If you are using a firewall, open a hole in your firewall so incoming connections can reach the ports you will use for your relay (ORPort, plus DirPort if you enabled it). +Also, make sure you allow all outgoing connections too, so your relay can reach the other Tor relays, clients and destinations. +You can find the specific ORPort TCP port number in the torrc configuration samples bellow (in the OS specific sections). ## Configuration Management -Tor does not scale well on multi-core machines. If you run a Tor relay on a -server with a fast Internet uplink (>200 Mbit/s) you might want to consider -running multiple Tor instances on a single server with multiple cores. Note: You -can only run two tor instances per public IPv4 address. +Tor does not scale well on multi-core machines. +If you run a Tor relay on a server with a fast Internet uplink (>200 Mbit/s) you might want to consider running multiple Tor instances on a single server with multiple cores. +Note: You can only run two tor instances per public IPv4 address. -If you plan to run more than a single relay, or you want to run a high capacity -relay (multiple Tor instances per server) or want to use strong security -features like [Offline Master -Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys) -without performing additional steps manually, you may want to use a configuration -management for better maintainability. +If you plan to run more than a single relay, or you want to run a high capacity relay (multiple Tor instances per server) or want to use strong security features like [Offline Master Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/Of… without performing additional steps manually, you may want to use a configuration management for better maintainability. -There are multiple configuration management solutions for Unix based operating -systems (Ansible, Puppet, Salt, ...). +There are multiple configuration management solutions for Unix based operating systems (Ansible, Puppet, Salt, ...). -The following Ansible Role has specifically been build for Tor relay operators -and supports multiple operating systems: +The following Ansible Role has specifically been build for Tor relay operators and supports multiple operating systems: http://github.com/nusenu/ansible-relayor @@ -185,35 +148,30 @@ Please choose your platform: ## Verify that your relay works -If your logfile (syslog) contains the following entry after starting your tor -daemon your relay should be up and running as expected: +If your logfile (syslog) contains the following entry after starting your tor daemon your relay should be up and running as expected: ``` Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` -About 3 hours after you started your relay it should appear on -[Relay Search](https://metrics.torproject.org/rs.html). You can search for your -relay using your nickname or IP address. +About 3 hours after you started your relay it should appear on [Relay Search](https://metrics.torproject.org/rs.html). +You can search for your relay using your nickname or IP address. # Getting Help -If you run into problems while setting up your relay you can ask your questions -on the public tor-relays mailing list: +If you run into problems while setting up your relay you can ask your questions on the public tor-relays mailing list: * https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays -This is a great resource for asking (and answering) questions, and generally -getting to know other relay operators. Make sure to check out the archives! +This is a great resource for asking (and answering) questions, and generally getting to know other relay operators. +Make sure to check out the archives! # Limiting bandwidth usage (and traffic) -Tor will not limit its bandwidth usage by default, but supports multiple ways to -restrict the used bandwidth and the amount of traffic. This can be handy if you -want to ensure that your Tor relay does not exceed a certain amount of bandwidth -or total traffic per day/week/month. The following torrc configuration options -can be used to restrict bandwidth and traffic: +Tor will not limit its bandwidth usage by default, but supports multiple ways to restrict the used bandwidth and the amount of traffic. +This can be handy if you want to ensure that your Tor relay does not exceed a certain amount of bandwidth or total traffic per day/week/month. +The following torrc configuration options can be used to restrict bandwidth and traffic: * AccountingMax * AccountingRule

1 0

[community/staging] add key, better strings
by emmapeel＠torproject.org 28 May '19

28 May '19

commit eb608718c2526eb9dc6ec9000829eddf22a29466 Author: emma peel <emma.peel(a)riseup.net> Date: Mon May 27 17:16:34 2019 +0200 add key, better strings --- content/relay-operations/relays-requirements/contents.lr | 5 ++--- content/relay-operations/technical-setup/centosrhel/contents.lr | 4 ++++ content/relay-operations/technical-setup/debianubuntu/contents.lr | 2 ++ content/relay-operations/technical-setup/fedora/contents.lr | 2 ++ content/relay-operations/technical-setup/freebsd/contents.lr | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay-operations/relays-requirements/contents.lr index f00ba88..d089c7e 100644 --- a/content/relay-operations/relays-requirements/contents.lr +++ b/content/relay-operations/relays-requirements/contents.lr @@ -16,12 +16,11 @@ html: relay-operations.html --- body: -Requirements for Tor relays depend on the type of relay and the bandwidth they -provide. +Requirements for Tor relays depend on the type of relay and the bandwidth they provide. # Bandwidth and Connections -A non-exit relay should be able to handle at least 7000 concurrent connections. +A non-exit relay should be able to handle at least 7000 concurrent connections. This can overwhelm consumer-level routers. If you run the Tor relay from a server (virtual or dedicated) in a data center you will be fine. If you run it behind a consumer-level router at home you will have to try and see if your home router can handle it or if it starts failing. Fast exit relays (>=100 Mbit/s) usually have to handle a lot more concurrent connections (>100k). diff --git a/content/relay-operations/technical-setup/centosrhel/contents.lr b/content/relay-operations/technical-setup/centosrhel/contents.lr index 224dadf..6bf5811 100644 --- a/content/relay-operations/technical-setup/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/centosrhel/contents.lr @@ -6,4 +6,8 @@ html: relay-operations.html --- section: relay operations --- +key: 5 +--- section_id: relay-operations +--- +body: diff --git a/content/relay-operations/technical-setup/debianubuntu/contents.lr b/content/relay-operations/technical-setup/debianubuntu/contents.lr index c8627c5..59cb13f 100644 --- a/content/relay-operations/technical-setup/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/debianubuntu/contents.lr @@ -8,6 +8,8 @@ section: relay operations --- section_id: relay-operations --- +key: 2 +--- body: # 1. Configure Tor Package Repository diff --git a/content/relay-operations/technical-setup/fedora/contents.lr b/content/relay-operations/technical-setup/fedora/contents.lr index a0ab0a4..d8018a9 100644 --- a/content/relay-operations/technical-setup/fedora/contents.lr +++ b/content/relay-operations/technical-setup/fedora/contents.lr @@ -4,6 +4,8 @@ title: Fedora --- html: relay-operations.html --- +key: 3 +--- section: relay operations --- section_id: relay-operations diff --git a/content/relay-operations/technical-setup/freebsd/contents.lr b/content/relay-operations/technical-setup/freebsd/contents.lr index de83c05..9073d5d 100644 --- a/content/relay-operations/technical-setup/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/freebsd/contents.lr @@ -6,4 +6,6 @@ html: relay-operations.html --- section: relay operations --- +key: 7 +--- section_id: relay-operations

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 6fa86ccd8329706a2abd5a82bf851800f238d9d0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 06:17:50 2019 +0000 Update translations for tba-torbrowserstringsdtd_completed --- zh-CN/torbrowser_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd index ddd5e5b30..58e704596 100644 --- a/zh-CN/torbrowser_strings.dtd +++ b/zh-CN/torbrowser_strings.dtd @@ -1,7 +1,7 @@  <!ENTITY firstrun_welcome_tab_title "欢迎"> <!ENTITY firstrun_welcome_title "一切就绪。"> -<!ENTITY firstrun_welcome_message "Tor Browser 在浏览互联网中提供最高标准的隐私和安全保护，帮助你对抗跟踪、监控和审查。这个快速指南会向你介绍我们是怎样做的。"> +<!ENTITY firstrun_welcome_message "Tor 浏览器在你浏览互联网时提供最高标准的隐私和安全保护，帮助你对抗追踪、监控和审查。这个快速入门指南会向你介绍我们是怎样做到的。"> <!ENTITY firstrun_welcome_next "现在开始"> <!ENTITY firstrun_privacy_tab_title "隐私"> <!ENTITY firstrun_privacy_title "拒绝跟踪和嗅探。"> @@ -9,7 +9,7 @@ <!ENTITY firstrun_privacy_next "前往“Tor 网络”"> <!ENTITY firstrun_tornetwork_tab_title "Tor 网络"> <!ENTITY firstrun_tornetwork_title "通过非中心化的网络进行浏览。"> -<!ENTITY firstrun_tornetwork_message "Tor Browser 将你和世界数千名志愿者支持的 Tor 网络相连。和 VPN 不同的是，这里不会有单点故障，也不需要你为了私密浏览信任某一个中心化的实体。"> +<!ENTITY firstrun_tornetwork_message "Tor 浏览器将你和世界数千名志愿者支持的 Tor 网络相连。和 VPN 不同的是，这里不会有单点故障，也不需要你为了私密浏览信任某一个中心化的实体。"> <!ENTITY firstrun_tornetwork_next "下一步"> <!ENTITY firstrun_secsettings_tab_title "安全"> <!ENTITY firstrun_secsettings_title "自定你的浏览体验。">

1 0