February 2022 - tor-commits - lists.torproject.org

[tor/maint-0.4.6] hs: Double quote the metrics label value
by dgoulet＠torproject.org 03 Feb '22

03 Feb '22

commit 3c73622f27c67eb636f19a938c5f401da8db901f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 2 13:51:22 2022 -0500 hs: Double quote the metrics label value Fixes #40552 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/ticket40552 b/changes/ticket40552 new file mode 100644 index 0000000000..7811f3a743 --- /dev/null +++ b/changes/ticket40552 @@ -0,0 +1,3 @@ + o Minor bugfixes (MetricsPort, Prometheus): + - Add double quotes to the label values of the onion service metrics. Fixes + bug 40552; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index e6d3084f26..452bb44419 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -32,12 +32,16 @@ port_to_str(const uint16_t port) /** Return a static buffer pointer that contains a formatted label on the form * of key=value. * + * NOTE: Important, label values MUST NOT contain double quotes else, in the + * case of Prometheus, it will fail with a malformed line because we force the + * label value to be enclosed in double quotes. + * * Subsequent call to this function invalidates the previous buffer. */ static const char * format_label(const char *key, const char *value) { static char buf[128]; - tor_snprintf(buf, sizeof(buf), "%s=%s", key, value); + tor_snprintf(buf, sizeof(buf), "%s=\"%s\"", key, value); return buf; } diff --git a/src/test/test_metrics.c b/src/test/test_metrics.c index 152dd99d23..58628e8483 100644 --- a/src/test/test_metrics.c +++ b/src/test/test_metrics.c @@ -30,8 +30,8 @@ #define TEST_METRICS_ENTRY_NAME "entryA" #define TEST_METRICS_ENTRY_HELP "Description of entryA" -#define TEST_METRICS_ENTRY_LABEL_1 "label=farfadet" -#define TEST_METRICS_ENTRY_LABEL_2 "label=ponki" +#define TEST_METRICS_ENTRY_LABEL_1 "label=\"farfadet\"" +#define TEST_METRICS_ENTRY_LABEL_2 "label=\"ponki\"" static void set_metrics_port(or_options_t *options)

1 0

[tor/release-0.4.5] hs: Double quote the metrics label value
by dgoulet＠torproject.org 03 Feb '22

03 Feb '22

commit 3c73622f27c67eb636f19a938c5f401da8db901f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 2 13:51:22 2022 -0500 hs: Double quote the metrics label value Fixes #40552 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/ticket40552 b/changes/ticket40552 new file mode 100644 index 0000000000..7811f3a743 --- /dev/null +++ b/changes/ticket40552 @@ -0,0 +1,3 @@ + o Minor bugfixes (MetricsPort, Prometheus): + - Add double quotes to the label values of the onion service metrics. Fixes + bug 40552; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index e6d3084f26..452bb44419 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -32,12 +32,16 @@ port_to_str(const uint16_t port) /** Return a static buffer pointer that contains a formatted label on the form * of key=value. * + * NOTE: Important, label values MUST NOT contain double quotes else, in the + * case of Prometheus, it will fail with a malformed line because we force the + * label value to be enclosed in double quotes. + * * Subsequent call to this function invalidates the previous buffer. */ static const char * format_label(const char *key, const char *value) { static char buf[128]; - tor_snprintf(buf, sizeof(buf), "%s=%s", key, value); + tor_snprintf(buf, sizeof(buf), "%s=\"%s\"", key, value); return buf; } diff --git a/src/test/test_metrics.c b/src/test/test_metrics.c index 152dd99d23..58628e8483 100644 --- a/src/test/test_metrics.c +++ b/src/test/test_metrics.c @@ -30,8 +30,8 @@ #define TEST_METRICS_ENTRY_NAME "entryA" #define TEST_METRICS_ENTRY_HELP "Description of entryA" -#define TEST_METRICS_ENTRY_LABEL_1 "label=farfadet" -#define TEST_METRICS_ENTRY_LABEL_2 "label=ponki" +#define TEST_METRICS_ENTRY_LABEL_1 "label=\"farfadet\"" +#define TEST_METRICS_ENTRY_LABEL_2 "label=\"ponki\"" static void set_metrics_port(or_options_t *options)

1 0

[tor/release-0.4.6] hs: Double quote the metrics label value
by dgoulet＠torproject.org 03 Feb '22

03 Feb '22

commit 3c73622f27c67eb636f19a938c5f401da8db901f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 2 13:51:22 2022 -0500 hs: Double quote the metrics label value Fixes #40552 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/ticket40552 b/changes/ticket40552 new file mode 100644 index 0000000000..7811f3a743 --- /dev/null +++ b/changes/ticket40552 @@ -0,0 +1,3 @@ + o Minor bugfixes (MetricsPort, Prometheus): + - Add double quotes to the label values of the onion service metrics. Fixes + bug 40552; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index e6d3084f26..452bb44419 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -32,12 +32,16 @@ port_to_str(const uint16_t port) /** Return a static buffer pointer that contains a formatted label on the form * of key=value. * + * NOTE: Important, label values MUST NOT contain double quotes else, in the + * case of Prometheus, it will fail with a malformed line because we force the + * label value to be enclosed in double quotes. + * * Subsequent call to this function invalidates the previous buffer. */ static const char * format_label(const char *key, const char *value) { static char buf[128]; - tor_snprintf(buf, sizeof(buf), "%s=%s", key, value); + tor_snprintf(buf, sizeof(buf), "%s=\"%s\"", key, value); return buf; } diff --git a/src/test/test_metrics.c b/src/test/test_metrics.c index 152dd99d23..58628e8483 100644 --- a/src/test/test_metrics.c +++ b/src/test/test_metrics.c @@ -30,8 +30,8 @@ #define TEST_METRICS_ENTRY_NAME "entryA" #define TEST_METRICS_ENTRY_HELP "Description of entryA" -#define TEST_METRICS_ENTRY_LABEL_1 "label=farfadet" -#define TEST_METRICS_ENTRY_LABEL_2 "label=ponki" +#define TEST_METRICS_ENTRY_LABEL_1 "label=\"farfadet\"" +#define TEST_METRICS_ENTRY_LABEL_2 "label=\"ponki\"" static void set_metrics_port(or_options_t *options)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 03 Feb '22

03 Feb '22

commit 6be7023e1c5c755e8de9d6d8ec94d19cf7d4f55f Merge: 608f109597 a08b12568e Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 3 08:30:40 2022 -0500 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 03 Feb '22

03 Feb '22

commit a08b12568eb7f1d1fb8bd34847461e0887b6981d Merge: bc500804fd 3c73622f27 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 3 08:30:40 2022 -0500 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-)

1 0

[translation/tbmanual-contentspot] new translations in tbmanual-contentspot
by translation＠torproject.org 03 Feb '22

03 Feb '22

commit 1ae5e212082c7f9152a4844544c8e2a0f831f5a0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 3 13:16:55 2022 +0000 new translations in tbmanual-contentspot --- contents+pt-BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index e1f55d0420..84cdfceb13 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -16,9 +16,9 @@ # Henrique Casellato, 2021 # Gus, 2021 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2021 -# Emma Peel, 2021 # Billy Bill, 2021 # Transifex Bot <>, 2022 +# Emma Peel, 2022 # msgid "" msgstr "" @@ -26,7 +26,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-08 15:23+UTC\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Transifex Bot <>, 2022\n" +"Last-Translator: Emma Peel, 2022\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -393,8 +393,8 @@ msgid "" "<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor " "Browser works\">" msgstr "" -"<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor " -"Browser works\">" +"<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"Como o " +"navegador Tor funciona\"/>" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 03 Feb '22

03 Feb '22

commit 222c17973ccf66d7321fea70523b5bfe777e62a6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 3 13:15:12 2022 +0000 new translations in communitytpo-contentspot --- contents+tr.po | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- contents+zh-TW.po | 46 ++++++++++++++------------ 2 files changed, 119 insertions(+), 25 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 905e3b0317..724ceb79f0 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5424,6 +5424,11 @@ msgid "" "browser](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues) (but make sure to search the repo for duplicates first)." msgstr "" +"* Ya da bir GitLab hesabınız varsa, [applications/tor-" +"browser](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues) adresinde bulabileceğiniz kalıpları kullanarak bulduğunuz " +"hataları gönderin (ancak daha önce bildirilmemiş olduğundan emin olmak için " +"depoya bakın)." #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) @@ -5434,6 +5439,11 @@ msgid "" "bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not " "putting yourself at risk." msgstr "" +"Lütfen [download a Tor Browser " +"Alpha](https://www.torproject.org/download/alpha/) sürümünü yalnız bazı " +"şeylerin düzgün çalışmamasına hazırsanız, hataları bulmaya ve " +"[bildirmeye](https://support.torproject.org/tr/misc/bug-or-feedback/) yardım" +" etmek istiyorsanız ve kendinizi riske atmayacaksanız indirin." #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -5469,6 +5479,13 @@ msgid "" "PDF](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/20…" "_Tor.pdf?inline=false) |" msgstr "" +"| Forum Yapısı Araştırması | Anket " +"([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2021/tree-" +"testing-forum.md)) | çevrimiçi | 1Ç21, 3Ç21 | [Gitlab üzerinde " +"bakın](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/…" +"_Tor.pdf) · [PDF dosyasını indirin](https://gitlab. " +"torproject.org/tpo/ux/research/-/blob/master/reports/2021/Report_Forum_Stru…" +"_Tor.pdf?inline=false) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -5479,6 +5496,12 @@ msgid "" "PDF](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/20…" "browser-user-survey-public.pdf?inline=false) |" msgstr "" +"| Tor Browser kullanıcı anketi | Anket | çevrimiçi | 1Ç21, 2Ç21 | [Gitlab " +"üzerinde " +"bakın](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/…" +"browser-user-survey-public.pdf) · [PDF dosyasını indirin]( " +"https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/to…" +"browser-user-survey-public.pdf?inline=false) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -5637,6 +5660,14 @@ msgid "" "[survey](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports…" "up_Survey_-_Costa_Rica_-_Internews.md): Costa Rica, 2021." msgstr "" +"* [Kullanıcı araştırması - Tor Browser katılım " +"raporu](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports…" +"Tor-CostaRica.md), " +"[röportajlar](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/re…" +"up_Interviews_-_Costa_Rica_-_Internews.md) için izleme raporu ve " +"[anket](https:// " +"gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/Report_Fol…" +"up_Survey_-_Costa_Rica_-_Internews.md): Kosta Rika, 2021." #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -7467,6 +7498,11 @@ msgid "" "[Relay Operator](https://forum.torproject.net/c/support/relay-operator/17) " "sub-category on the Tor Forum!" msgstr "" +"Sorularınızı herkese açık [tor-relays e-posta " +"listesine](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays)" +" ve Tor forumundaki [aktarıcı " +"işletmecisi](https://forumtorproject.net/c/support/relay-operator/17) " +"kategorisi üzerinden sorabilirsiniz." #: https//community.torproject.org/relay/getting-help/ #: (content/relay/getting-help/contents+en.lrpage.body) @@ -7788,6 +7824,9 @@ msgid "" "* You can start a topic on the [Tor Forum Localization Feedback " "section](https://forum.torproject.net/c/feedback/localization-feedback/8)" msgstr "" +"* [Tor forum yerelleştirme geri bildirimi " +"bölümünde](https://forum.torproject.net/c/feedback/localization-feedback/8) " +"bir konu başlatabilirsiniz." #: https//community.torproject.org/localization/hangouts/ #: (content/localization/hangouts/contents+en.lrpage.body) @@ -11485,12 +11524,12 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "* Frantech / Ponynet (AS53667)" -msgstr "" +msgstr "* Frantech / Ponynet (AS53667)" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "These hosts already have many Tor nodes being hosted there." -msgstr "" +msgstr "Bu sunucular zaten birçok Tor düğümü barındırıyor." #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11547,6 +11586,9 @@ msgid "" " like Abuse (in any form) at all. Seems to give out customer data at alleged" " abuse. Not recommended but cheap. | 12/2011 |" msgstr "" +"| [A1(eski Telekom Austria)](https://a1.net) | - | - | Evet | Hayır | Kötüye" +" kullanımı sevmez (her türlüsünü). Kötüye kullanım iddialarında müşteri " +"verilerini paylaşıyor gibi görünüyor. Önerilmez ama ucuz. | 12/2011 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11574,6 +11616,9 @@ msgid "" "friendly Internet Use Policy (e.g., running a Tor relay) and has taken a " "stand in favor of net neutrality | 2008/12 |" msgstr "" +"| [TekSavvy](https://www.teksavvy.ca) | - | Evet | Evet | ? | sunucu dostu " +"bir İnternet kullanım ilkesi var (bir Tor aktarıcısı işletmek gibi) ve ağ " +"tarafsızlığını destekler | 12/2008 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11583,6 +11628,10 @@ msgid "" "handling differs depending on the provider from which they resell. | 2016/06" " |" msgstr "" +"| [oneprovider](https://oneprovider.com/) | - | Evet | Evet | Evet | " +"Dünyanın birçok yerinde fiziksel sunucular satıyor. Kötüye kullanım " +"süreçleri, satış yaptıkları hizmet sağlayıcıya göre farklılık gösterir. | " +"06/2016 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11590,6 +11639,9 @@ msgid "" "| [Vidéotron Ltee](https://videotron.com/) | AS5769 | Yes | Yes | ? | No " "mention of Tor in ToS, relays and bridges seem allowed. | - |" msgstr "" +"| [Vidéotron Ltee](https://videotron.com/) | AS5769 | Evet | Evet | ? | " +"Hizmet koşullarında Tor ile ilgili bir bilgi yok. Aktarıcı ve köprülere izin" +" veriliyor gibi görünüyor. | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11600,6 +11652,7 @@ msgstr "### Çek Cumhuriyeti" #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "| [T-Systems](https://www.t-mobile.cz/) | - | Yes | Yes | ? | - | - |" msgstr "" +"| [T-Systems](https://www.t-mobile.cz/) | - | Evet | Evet | ? | - | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11613,6 +11666,9 @@ msgid "" "account holder is responsible for all the traffic going through theirs " "servers.| 01/28/2019 |" msgstr "" +"| [Online.net](https://www.online.net/) | AS12876 | Evet | Evet | Evet | " +"Hesap sahibi, kendi sunucularından geçen tüm trafikten sorumludur.| " +"28/01/2019 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11637,11 +11693,17 @@ msgid "" "suspension and even termination of your server and account.\" Locations: " "FR,CA | 09/27/2021 |" msgstr "" +"| [OVH Kimsufi](https://www.kimsufi.com/) | AS16276 | Evet | Evet | Hayır | " +"Ölçülmemiş bant genişliği @ 100mbps - \"Bu durumu size memnuniyetle " +"açıklayacağım. Tor çıkış aktarıcısı işletmek kesinlikle yasaktır ve " +"sunucunuzun ve hesabınızın askıya alınmasına ve hatta sonlandırılmasına " +"neden olabilir.\" Konumlar: FR, CA | 27/09/2021 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "| [Digicube](https://www.digicube.fr/) | - | Yes | Yes | Yes | - | - |" msgstr "" +"| [Digicube](https://www.digicube.fr/) | - | Evet | Evet | Evet | - | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11649,6 +11711,9 @@ msgid "" "| [Pulse Servers](https://www.pulseservers.com/) | AS16276 | Yes | Yes | Yes" " | VPS uses OVH AS. You can build ANY kind tor relays. | 09/27/2021 |" msgstr "" +"| [Pulse Servers](https://www.pulseservers.com/) | AS16276 | Evet | Evet | " +"Evet | VPS, OVH AS kullanır. Her türde aktarıcıyı kurabilirsiniz. | " +"27/09/2021 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11661,6 +11726,8 @@ msgid "" "| [Creanova](https://creanova.org) | AS51765 | Yes | Yes | No | - | " "12/19/2018 |" msgstr "" +"| [Creanova](https://creanova.org) | AS51765 | Evet | Evet | Hayır | - | " +"19/12/2018 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11698,6 +11765,11 @@ msgid "" "Prime64 and Pro64 with Pro-Option, own subnet, RIPE entry along with " "publicly visible abuse and police contact.\" | 03/2021 |" msgstr "" +"| [EUServ](https://euserv.de) | AS35366 | Evet | Evet | Evet | \"Aktarıcılar" +" için yalnız fiziksel Prime64 ve Pro64 sunucuları verilir, Çıkış " +"aktarıcılarına yalnız Prime64 ve Pro64 sunucularında Pro seçeneği ile, kendi" +" alt ağı, RIPE kaydı ve herkesin görebileceği kötüye kullanım ve iletişim " +"bilgileri ile izin verilir.\" | 03/2021 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11716,6 +11788,8 @@ msgid "" "| [Afterburst](https://afterburst.com) | AS29761, AS8100 | - | Yes | No | " "- | - |" msgstr "" +"| [Afterburst](https://afterburst.com) | AS29761, AS8100 | - | Evet| Hayır" +" | - | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -11752,6 +11826,11 @@ msgid "" "servers, 20tb on vps. \"It is not a Problem, however, abuse reports can lead" " to a server lock\" Locations: DE,FI | 09/27/2021 |" msgstr "" +"| [Hetzner](https://hetzner.de) | AS24940 | Evet | Evet | Evet | İyi bir " +"fiyata iyi fiziksel kök sunucular sunar. Fiziksel sunucularda ölçülmeyen " +"bant genişliği, VPS üzerinde 20Tb. \"Bu bir sorun değil, ancak kötüye " +"kullanım raporlarına göre sunucuyu kilitleyebiliriz\" Konumlar: DE, FI | " +"27/09/2021 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -12073,6 +12152,9 @@ msgid "" "| [Baltic Servers](https://www.balticservers.com) | - | Yes | Yes | Yes | " "All abuse mails they got yielded support tickets | - |" msgstr "" +"| [Baltic Servers](https://www.balticservers.com) | - | Evet | Evet | Evet " +"| Aldıkları tüm kötüye kullanım şikayetleri destek çağrıları ile sonuçlandı " +"| - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -12249,6 +12331,11 @@ msgid "" "most stable. You need to email them for a custom offer. They also accept " "Bitcoin/UKash/CashU | - |" msgstr "" +"| [Novogara](https://www.novogara.com) | - | Evet | Evet | Evet | Açıkça Tor" +" çıkış aktarıcılarına izin verir ve kötüye kullanım şikayetlerini ve DCMA " +"bildirimlerini iletir. Ancak ağları en kararlı olanlardan değil. Özel bir " +"teklif için e-posta göndermeniz gerekir. Ayrıca Bitcoin/UKash/CashU kabul " +"eder | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -12256,16 +12343,19 @@ msgid "" "| [Netrouting](https://netrouting.nl/) | - | Yes | Yes | No | ISP has " "confirmed by e-mail that exit nodes are NOT acceptable. | 2014-10-15 |" msgstr "" +"| [Netrouting](https://netrouting.nl/) | - | Evet | Evet | Hayır | İnternet " +"hizmeti sağlayıcısı çıkış aktarıcılarını kabul etmediğini e-posta ile " +"onayladı. | 15/10/2014 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "| [DirectVPS](https://directvps.nl/) | - | Yes | Yes | ? | - | - |" -msgstr "" +msgstr "| [DirectVPS](https://directvps.nl/) | - | Evet | Evet | ? | - | - |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) msgid "| [Versio](https://versio.nl/) | - | Yes | Yes | No | - | 2013 |" -msgstr "" +msgstr "| [Versio](https://versio.nl/) | - | Evet | Evet | Hayır | - | 2013 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 0e737819f8..3212afe4cd 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -13,8 +13,8 @@ # erinm, 2021 # Emma Peel, 2021 # Bryce Tsao <tsaodingtw(a)gmail.com>, 2021 -# Agustín Wu, 2022 # Transifex Bot <>, 2022 +# Agustín Wu, 2022 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-24 13:21+UTC\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Transifex Bot <>, 2022\n" +"Last-Translator: Agustín Wu, 2022\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2983,7 +2983,7 @@ msgstr "此頁面的貢獻者：" #: https//community.torproject.org/outreach/kit/ #: (content/outreach/kit/contents+en.lrpage.body) msgid "## Street Team Kit" -msgstr "## 街頭團隊包" +msgstr "## 街頭行動團隊包" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.section) @@ -3680,6 +3680,8 @@ msgid "" "surveillance, for example, might attract more attention when reaching out to" " other activists to run a digital security training." msgstr "" +"1. **您的威脅模型** " +"對於高調的社會運動人士而言，他們本身已經是受到高密集度監控的目標，因此當他們與其他運動人士合作辦理數位安全教育時，可能會引起更多的關注。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -3688,14 +3690,14 @@ msgid "" "and local freedom of expression organizations and learn whether your country" " has a record in prosecuting individuals engaging in similar types of " "activities." -msgstr "" +msgstr "2. **在地國家當法規** 與當地的律師或言論自由倡議組織接洽，以了解您的國家過去是否曾經起訴過類似活動的參與者。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "3. **The types of training.** Not all trainings carry the same weight in " "terms of potential risk." -msgstr "" +msgstr "3. **教育訓練的種類** 並非所有的教育訓練都帶有相同的潛在風險。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -3703,7 +3705,7 @@ msgid "" "For example, talking about privacy in the digital age might be appreciated, " "but teaching how to circumvent government censorship could be a serious " "felony." -msgstr "" +msgstr "舉例來說，提倡數位時代的線上隱私或許會廣受歡迎，但是當要教育人們去突破政府的網路審查過濾時，可能就會被視為是重罪。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -3713,39 +3715,41 @@ msgid "" "leaked documents about government corruption, you might need to take extra " "care to reach out to them in a private way." msgstr "" +"4. **聽眾** " +"若參與課程的學員都是大學生的話，或許並不會引來太多的關注，但是當您的授課對象是正在處理有關政府貪污案件洩密檔案的媒體記者時，您會需要格外留意，或許需要考慮以隱密的方式與他們聯繫。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "5. **The training venue.** Running a Tor training in some spaces could " "expose your participants' identities." -msgstr "" +msgstr "5. **課程的場地** 在某些特定的場館辦理洋蔥路由教育訓練，有可能會讓參訓學員的身份被暴露。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "Ideally, you should use a private space where you control the participants' " "entrance." -msgstr "" +msgstr "理想的作法是在私人的場地舉辦，這樣您較能夠掌控人員的進出。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "If the space isn't private, check before the training to find out if " "participants are comfortable with revealing their identity to a third party." -msgstr "" +msgstr "如果課程的場地不是私人的話，請先確認參訓學員是否會介意自己的身份被第三方人士知悉。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "## Evaluating risks" -msgstr "" +msgstr "## 風險評估" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "Some questions you may want to answer before running a digital security " "training include:" -msgstr "" +msgstr "有幾個問題您可能需要在舉辦數位安全教育前，先審慎思考並找出答案：" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -3753,39 +3757,39 @@ msgid "" "* Has anyone in my country ever been criminalized based on their internet " "activity? (This does not necessarily need to be specific to digital security" " training or use of Tor.)" -msgstr "" +msgstr "* 在我所身處的國家裡，是否曾經有人因為個人的網路活動而被起訴定罪？(不限於因為數位安全教育或使用洋蔥路由等相關議題)" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "* Are there laws in my country that require Internet Service Providers " "(ISPs) to track my online activity?" -msgstr "" +msgstr "* 在我所身處的國家裡，有沒有任何法律條文明文規定，網路服務供應商(ISP)應該要追蹤我的網路活動？" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* Is it illegal for me to access certain websites?" -msgstr "" +msgstr "* 是否有任何網站只要造訪就會被視為違法呢？" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* Does my country prohibit me from using:" -msgstr "" +msgstr "* 我所身處的國家是否有禁止使用下列工具：" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* Cryptography?" -msgstr "" +msgstr "* 密碼學相關軟體？" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* Anonymity software?" -msgstr "" +msgstr "* 匿名通訊軟體？" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "Note, this is not an exhaustive list of questions." -msgstr "" +msgstr "請注意，這裡所指的並不僅限於上列的項目。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -3794,21 +3798,21 @@ msgid "" " the activity of running a digital security training, the use of digital " "security tools may still be criminalized in certain countries under other, " "broader laws." -msgstr "" +msgstr "並且要注意的是，有許多國家的法律不會明文禁止數位安全教育相關的活動，但是使用數位安全工具卻仍有可能會被較廣義的解釋為違法行為。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "For example, using Tor Browser may be viewed as illegal or anti-government " "activity." -msgstr "" +msgstr "舉例來說，使用洋蔥路由瀏覽器可能會被視為視違法的，甚至被當成是反政府活動。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "" "Please note that we are not lawyers, and any information we give you does " "not constitute legal advice." -msgstr "" +msgstr "請您要注意的是，我們並不是律師，因此這裡所提供的資訊並不能作為法律上的建議。" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 03 Feb '22

03 Feb '22

commit 1aa024df4b47f377810ba8144442a05fb173adbf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 3 12:45:10 2022 +0000 new translations in communitytpo-contentspot --- contents+tr.po | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index b3acac0bb0..905e3b0317 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -9,9 +9,9 @@ # T. E. Kalayci <tekrei(a)tutanota.com>, 2021 # escher <escherichia2(a)msn.com>, 2021 # erinm, 2021 -# Kaya Zeren <kayazeren(a)gmail.com>, 2022 # Emma Peel, 2022 # Transifex Bot <>, 2022 +# Kaya Zeren <kayazeren(a)gmail.com>, 2022 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-24 13:21+UTC\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Transifex Bot <>, 2022\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2022\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -615,7 +615,7 @@ msgstr "" #: (dynamic) https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.title) msgid "Become an alpha tester" -msgstr "" +msgstr "Alfa test kullanıcısı olun" #: (dynamic) https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.subtitle) @@ -5363,7 +5363,7 @@ msgstr "" #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) msgid "# Become an alpha tester" -msgstr "" +msgstr "# Alfa test kullanıcısı olun" #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) @@ -5372,6 +5372,9 @@ msgid "" "community of volunteer Quality Assurance (QA) testers to trial alpha " "versions of Tor Browser before its general release." msgstr "" +"Tor Browser uygulamasının birçok platformda kullanılabilir kalmasını " +"sağlamak için, genel yayından önce Tor Browser alfa sürümlerini deneyen " +"gönüllü Kalite Güvencesi (QA) test uzmanları topluluğuna güveniyoruz." #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) @@ -5380,11 +5383,14 @@ msgid "" "opportunity to provide feedback on new features to the team before they " "reach Tor Browser stable." msgstr "" +"Hataları bulup bildirmenin yanında, alfa test kullanıcıları geliştiricilere " +"Tor Browser kararlı sürüme ulaşmadan önce yeni özellikler hakkında geri " +"bildirim sağlama fırsatını da kullanır." #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) msgid "## How to get started" -msgstr "" +msgstr "## Nasıl başlanır" #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) @@ -5393,6 +5399,9 @@ msgid "" "bin/mailman/listinfo/tor-qa) to receive an email whenever a new alpha is " "ready for testing." msgstr "" +"* Yeni bir alfa sürümü test için hazır olduğunda bir e-posta almak için [Tor" +" QA posta listesine](https://lists.torproject.org/cgi-" +"bin/mailman/listinfo/tor-qa) katılın." #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body) @@ -5402,6 +5411,10 @@ msgid "" "Feedback](https://forum.torproject.net/c/feedback/tor-browser-alpha-" "feedback/6) category." msgstr "" +"* [Tor Forumunda](https://forum.torproject.net/) bir hesap açın ve " +"gördüğünüz sorunları [Tor Browser Alpha geri " +"gildirimi](https://forum.torproject.net/c/feedback/tor-browser-alpha-" +"feedback/6) bölümüne yazın." #: https//community.torproject.org/user-research/become-tester/ #: (content/user-research/become-tester/contents+en.lrpage.body)

1 0

[translation/tbmanual-contentspot] new translations in tbmanual-contentspot
by translation＠torproject.org 03 Feb '22

03 Feb '22

commit 76cea68fe3ad7064c993bd23857e466fa052c04d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 3 11:46:47 2022 +0000 new translations in tbmanual-contentspot --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index c51a789596..b1aa043c97 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -10,8 +10,8 @@ # erinm, 2021 # Layla Taha <layla(a)asl19.org>, 2021 # Ahmed A., 2021 -# Emma Peel, 2021 # Malcolm <nomadweb(a)protonmail.ch>, 2021 +# Emma Peel, 2022 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-08 15:23+UTC\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Malcolm <nomadweb(a)protonmail.ch>, 2021\n" +"Last-Translator: Emma Peel, 2022\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1246,7 +1246,7 @@ msgid "" "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " "of \"bridge\" relays." msgstr "" -"تعتمد معظم [وسائل النقل القابلة للتوصيل](../circumvention/)، مثل obfs4، على " +"تعتمد معظم (../circumvention/)[وسائل النقل القابلة للتوصيل]، مثل obfs4، على " "استخدام مرحلات \"الجسر\"." #: https//tb-manual.torproject.org/bridges/

1 0

[translation/gettor-website-contentspot] add previews. ref: tpo/community/l10n#40049
by emmapeel＠torproject.org 03 Feb '22

03 Feb '22

commit 470d20f582cdeb8ce778527fc65aaa7a3ac26571 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Feb 3 11:27:43 2022 +0000 add previews. ref: tpo/community/l10n#40049 --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbb08023d3..25b885a4e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ -variables: +variables: TRANSLATION_BRANCH : "gettor-website-contentspot" - -include: - project: tpo/community/l10n - file: ci-templates/lektor-with-more-langs.yml + LEKTOR_PROJECT: tpo/web/gettor-web + +include: + - project: tpo/tpa/ci-templates + file: lektor-l10n-staging-trigger.yml

1 0