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

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 0641275a3b0b9ee8a84f1a7ebd75813f2670f812 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 14:18:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca.po b/ca.po index e7fe80176..35aa70d23 100644 --- a/ca.po +++ b/ca.po @@ -4,8 +4,8 @@ # # Translators: # Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>, 2014,2018 -# Assumpta Anglada, 2014 -# Assumpta Anglada, 2018 +# Assumpta, 2014 +# Assumpta, 2018 # Benny Beat <bennybeat(a)gmail.com>, 2019 # Ecron <ecron_89(a)hotmail.com>, 2018 # Eloi García i Fargas, 2014

1 0

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

23 Oct '19

commit 12a2a1272ee09f63847ea3360d3cd1a313828871 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 14:16:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+he.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po index 295b65442..787531634 100644 --- a/code_of_conduct+he.po +++ b/code_of_conduct+he.po @@ -610,6 +610,11 @@ msgid "" "format. The next steps in an incident response will vary on a case-by-case " "basis." msgstr "" +"מועצת הקהילה נותנת חשיבות לבטיחות כל אדם שמרגיש/ה שעלול להיגרם לו/ה נזק. כל " +"מי שידווח/תדווח למועצת הקהילה יכל/ה לצפות שהדיווח ילקח ברצינות. דיווחים " +"ראשוניים יכלים להילקח בכתב או בע\"פ. אם התקרית לא מצריכה פתרון מיידי, אז " +"דו\"ח כתוב יכל להישלח למועצת הקהילה באופן מוצפן. הצעדים הבאים בתגובה לתקרית" +" ישתנו ממקרה למקרה. " #. type: Plain text #: ../code_of_conduct.txt:245 @@ -618,6 +623,8 @@ msgid "" "8. How the Community Council responds to incidents\n" "============================================================\n" msgstr "" +"8. איך מועצת הקהילה מגיבה לתקריות\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:252

1 0

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

23 Oct '19

commit c3e2f52a63f6c22e22d33342f6ffcb4f421fd742 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 13:46:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ca.po | 2 +- code_of_conduct+he.po | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code_of_conduct+ca.po b/code_of_conduct+ca.po index f3bbed10b..9ed0be6b6 100644 --- a/code_of_conduct+ca.po +++ b/code_of_conduct+ca.po @@ -613,7 +613,7 @@ msgstr "patrocinadors" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:264 msgid "other guests" -msgstr "" +msgstr "altres participants" #. type: Plain text #: ../code_of_conduct.txt:266 diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po index 6d86b11f0..295b65442 100644 --- a/code_of_conduct+he.po +++ b/code_of_conduct+he.po @@ -5,8 +5,8 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# ido vasserman <itaizand(a)gmail.com>, 2019 # ION, 2019 +# ido vasserman <itaizand(a)gmail.com>, 2019 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: ION, 2019\n" +"Last-Translator: ido vasserman <itaizand(a)gmail.com>, 2019\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -579,6 +579,14 @@ msgid "" "danger or harm to anyone. More information about the Community Council's " "incident reporting and response policies can be found on their wiki [1]." msgstr "" +"אם חזית בהתנהגות לא מקובלת, או אם יש לך שאלות/חששות, אנא צור/י קשר עם מועצת " +"הקהילה. תוכלו ליצור קשר עם המועצה באופן אישי, או לפנות ל- tor-community-" +"council(a)lists.torproject.org. חברי/ות המועצה הנוכחים/ות מוצגים בוויקי [1]." +" תגובת המועצה תשתנה בהתאם למקרה. המועצה תנסה להגיב לכל תקרית מייד. המועצה " +"תעדיף את ביטחון האדם שנפגע, או בסיכון להיפגע. אנשים שנפגעו או בסיכון יכלים " +"לבטל את דיווח התקרית בכל רגע. אנחנו לא יעשו דבר ללא הסכמת האדם שנפגע, או " +"בסיכון להיפגע., למעט מקרים בהם יש סכנה מיידית למישהו/י. עוד מידע בנוגע " +"לדיווח תקריות למועצת הקהילה ותקנות התגובות אפשר למצוא בוויקי שלהם [1]." #. type: Plain text #: ../code_of_conduct.txt:233 @@ -587,6 +595,8 @@ msgid "" "7. What the person reporting a violation can expect\n" "============================================================\n" msgstr "" +"7. למה האדם שדיווח על הפרה אמור לצפות\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:242

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit 94f2e5e7e73c3b5b52055eadd0e2dcc864d598c4 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Oct 22 15:00:02 2019 -0700 Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index c7bd6f4236ae..0b682ceeeb83 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -211,7 +211,7 @@ var TorStrings = { "torPreferences.advancedDescription", "Configure how Tor Browser connects to the internet." ), - useLocalProxy: getString("torPreferences.useProxy", "Use a local proxy"), + useLocalProxy: getString("torsettings.useProxy.checkbox", "I use a proxy to connect to the Internet"), proxyType: getString("torsettings.useProxy.type", "Proxy Type"), proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"),

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit cbf86255ae7cfe82b555931d9db3b9e528036c65 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Oct 22 15:00:02 2019 -0700 Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index c7bd6f4236ae..0b682ceeeb83 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -211,7 +211,7 @@ var TorStrings = { "torPreferences.advancedDescription", "Configure how Tor Browser connects to the internet." ), - useLocalProxy: getString("torPreferences.useProxy", "Use a local proxy"), + useLocalProxy: getString("torsettings.useProxy.checkbox", "I use a proxy to connect to the Internet"), proxyType: getString("torsettings.useProxy.type", "Proxy Type"), proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"),

1 0

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

23 Oct '19

commit 4cb8e0edb8744a51d7974931c3e74a3efa3ca993 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 13:23:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index f9f8f85ad..ecc797574 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -5,8 +5,8 @@ # Ahmed A. <6622227a(a)gmail.com>, 2019 # Ahmed IB <mee.tbhole(a)gmail.com>, 2019 # erinm, 2019 -# Emma Peel, 2019 # Khaled Hosny, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-22 18:47+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Khaled Hosny, 2019\n" +"Last-Translator: Emma Peel, 2019\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" @@ -229,6 +229,9 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"نريد أن يقدر الجميع على التمتع بمتصفح Tor Browser بلغتهم الخاصة. متصفح Tor " +"Browser متوفر الآن ب25 لغة مختلفة, ونحن نتطلع لإضافة المزيد. هل تريد أن " +"تساعدنا بالترجمة [أنظر هنا](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title)

1 0

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

23 Oct '19

commit 995f18bbeae43ad4b614c820c5342bb9a879a2eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 13:16:48 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ca.po | 675 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 675 insertions(+) diff --git a/code_of_conduct+ca.po b/code_of_conduct+ca.po new file mode 100644 index 000000000..f3bbed10b --- /dev/null +++ b/code_of_conduct+ca.po @@ -0,0 +1,675 @@ +# Code of conduct of the tor project +# Copyright (C) 2019 tor project. +# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0 +# International license.e. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# jmontane, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Code of conduct of the Tor Project\n" +"POT-Creation-Date: 2019-08-02 12:00+0000\n" +"PO-Revision-Date: 2019-08-27 18:54+0000\n" +"Last-Translator: jmontane, 2019\n" +"Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24 +#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75 +#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180 +#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213 +#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243 +#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278 +#, no-wrap +msgid "============================================================\n" +msgstr "============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:3 +#, no-wrap +msgid "" +"Tor Project Code of Conduct\n" +"============================================================\n" +msgstr "" +"Codi de conducta del projecte Tor\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:6 +msgid "Statement of Intent:" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:10 +msgid "" +"The Tor Project is committed to fostering an inclusive environment and " +"community. Tor is a place where people should feel safe to engage, share " +"their point of view, and participate." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:15 +msgid "" +"This code of conduct applies to The Tor Project as a whole. It is intended " +"to provide guidelines for contributors. Employees and contractors of The Tor" +" Project, Inc. (TPI) are also subject to company policies and procedures. " +"Those people should feel free to contact HR with questions or concerns." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:23 +msgid "" +"This code of conduct is not exhaustive or complete. It is an ongoing effort " +"to summarize our shared understanding. We want to provide a welcoming, safe " +"environment, so we can work together to pursue powerful solutions. We " +"reserve the right to deviate from strictly enforcing this code. Any " +"deviations must produce an outcome which is fairer, and aligned with our " +"values. We understand that keeping a living document relevant and “patched” " +"involves sustained effort." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:26 +#, no-wrap +msgid "" +"0. Summary: Don't be a jerk. Be awesome instead.\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:29 +msgid "The Tor community should be a good place where people are glad to be." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:31 +#, no-wrap +msgid " DO: Be kind, thoughtful, and considerate.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:33 +#, no-wrap +msgid " DO: Make Tor a place where people are happy and comfortable.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:36 +#, no-wrap +msgid "" +" DO: Remember: We are all contributing; we are all learning. Nobody was born\n" +" an expert.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:43 +#, no-wrap +msgid "" +" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n" +" learning.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:46 +#, no-wrap +msgid "" +" DON'T: Hunt for ways to uphold the letter of this code while violating its\n" +" spirit.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:50 +#, no-wrap +msgid "" +" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n" +" questions or concerns. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:53 +#, no-wrap +msgid "" +"1. Purpose\n" +"============================================================\n" +msgstr "" +"1. Objectiu\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:63 +msgid "" +"A primary goal of the Tor community is to be inclusive of many different " +"contributors. We want to include contributors from the most varied and " +"diverse backgrounds possible. As such, we are committed to providing a " +"friendly, safe and welcoming environment for all, regardless of their " +"experience, gender identity or expression, sexual orientation, family, " +"relationships, ability (whether bodily or mental), personal appearance, " +"socioeconomic status, body size, race, ethnicity, age, religion, " +"nationality, or membership in a disadvantaged and/or underrepresented group." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:68 +msgid "" +"A safe environment means one free from abuse, whether isolated or systemic. " +"We explicitly acknowledge that tolerating abuse is a security problem. " +"Allowing abusers and malicious people to disrupt our community puts our " +"software, developers, and users at risk." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:71 +msgid "" +"This code of conduct outlines our expectations for all those who participate" +" in our community, as well as the consequences for unacceptable behavior." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:74 +msgid "" +"We invite all those who participate in The Tor Project to help us create " +"safe and positive experiences for everyone." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:80 +msgid "" +"The following behaviors are expected and requested of all community members:" +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:83 +msgid "" +"Participate in an honest and active way. In doing so, you contribute to the " +"health and longevity of this community." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:85 +msgid "Exercise consideration and respect in your speech and actions." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:87 +msgid "Attempt collaboration and dialog before engaging in conflict." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:89 +msgid "" +"Refrain from demeaning, discriminatory, or harassing behavior and speech." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:92 +msgid "" +"Be mindful of your surroundings and of your fellow participants. Alert " +"community leaders if you notice:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:94 +msgid "a dangerous situation" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:96 +msgid "someone in distress" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:98 +msgid "violations of this code of conduct, even if they seem minor" +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:101 +msgid "" +"Remember that community event venues may be shared with members of the " +"public. Please be respectful to everyone using these locations." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:103 +msgid "Respect the privacy of your fellow community members." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:106 +#, no-wrap +msgid "" +"3. Unacceptable behaviors\n" +"============================================================\n" +msgstr "" +"3. Comportaments inacceptables\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:109 +msgid "The following behaviors are unacceptable within our community:" +msgstr "Els comportaments següents són inacceptables en la nostra comunitat :" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:114 +msgid "" +"Violence, sexual assault, threats of violence, or violent language directed " +"against another person, especially violence against a person or group based " +"on a protected characteristic. (Display of weapons may constitute " +"intimidation or a threat of violence.)" +msgstr "" +"Violència, agressió sexual, amenaces de violència o llenguatge violent " +"dirigit contra una altra persona, especialment violència contra una persona " +"o grup en base una característica protegida. (L'exhibició d’armes pot " +"constituir intimidació o amenaça de violència.)" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:117 +msgid "" +"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" +" jokes and language." +msgstr "" +"Bromes i llenguatge sexistes, racistes, homofòbics, transfòbics, contra " +"persones amb discapacitat o discriminatoris d'alguna mena." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:122 +msgid "" +"Spontaneously posting or displaying sexually explicit or violent material. " +"(If it is necessary to share such material when working on Tor's mission, do" +" so with sensitivity. Be aware that many people don't want to see it.)" +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:125 +msgid "" +"Posting or threatening to post other people’s personally identifying " +"information (\"doxing\") without their consent." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:127 +msgid "Personal insults or attacks, particularly those related to:" +msgstr "Els insults o atacs personals, en particular els relacionats amb:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:129 +msgid "experience" +msgstr "experiència" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:131 +msgid "gender identity or expression" +msgstr "identitat o expressió de gènere" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:133 +msgid "sexual orientation" +msgstr "orientació sexual" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:135 +msgid "family" +msgstr "família" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:137 +msgid "relationships" +msgstr "relacions" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:139 +msgid "ability (whether bodily or mental)" +msgstr "capacitat (tant sigui física o mental)" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:141 +msgid "personal appearance" +msgstr "apariència personal" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:143 +msgid "socioeconomic status" +msgstr "estatus socioeconòmic" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:145 +msgid "body size" +msgstr "mida corporal" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:147 +msgid "race" +msgstr "raça" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:149 +msgid "ethnicity" +msgstr "ètnia" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:151 +msgid "age" +msgstr "edat" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:153 +msgid "religion" +msgstr "religió" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:155 +msgid "nationality" +msgstr "nacionalitat" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:157 +msgid "membership in a disadvantaged and/or underrepresented group" +msgstr "pertinença a un grup desafavorit o infrarepresentat" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:161 +msgid "" +"Inappropriate photography, audio recording, or recording of personal " +"information. You should have someone's consent before recording these " +"things, and before posting them publicly." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:164 +msgid "" +"Inappropriate physical contact. You should have someone’s consent before " +"touching them." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:167 +msgid "" +"Unwelcome sexual attention: this includes sexualized comments or jokes, " +"inappropriate touching, groping, and unwelcome sexual advances." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:169 +msgid "Deliberate intimidation, stalking or following (online or in person)." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:172 +msgid "" +"Deliberately undermining the spirit of this code while following the letter." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:175 +msgid "" +"Sustained disruption of any community events, including talks, " +"presentations, and online conversations." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:177 +msgid "Deliberately pushing against someone's stated boundaries." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:179 +msgid "Advocating for, or encouraging, any of the above behavior." +msgstr "" +"La justificació, o l'encoratjament, de qualsevol dels comportaments " +"anteriors." + +#. type: Plain text +#: ../code_of_conduct.txt:182 +#, no-wrap +msgid "" +"4. Unacceptable behavior has consequences\n" +"============================================================\n" +msgstr "" +"4. El comportament inacceptable té conseqüències\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:188 +msgid "" +"We will not tolerate unacceptable behavior from any community member. We " +"will not make exceptions for sponsors and those with decision-making " +"authority. People in formal or informal leadership roles must model the " +"highest standards of behavior." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:192 +msgid "" +"Anyone asked by another community member to stop unacceptable behavior is " +"expected to comply immediately. Please don't step in on someone else's " +"behalf without their consent." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:195 +#, no-wrap +msgid "" +"5. Where to go for help\n" +"============================================================\n" +msgstr "" +"5. On obtenir ajuda\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:201 +msgid "" +"The Community Council is an elected body of Tor Core Contributors who can " +"assist with intra-community conflict resolution. Community Council policies " +"and information can be found on the Community Council wiki [1]. You can " +"contact the whole Community council:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:203 +msgid "if you have questions or concerns about the code of conduct, or" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:205 +msgid "if you feel that you have witnessed a code of conduct violation" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:212 +msgid "" +"However, if you feel that there is a conflict of interest with any council " +"member, you may contact members individually. Council members' GPG keys are " +"listed on the Community Council wiki. If there is a conflict of interest, " +"the affected council member will recuse themselves. They will not be " +"involved in any discussion or documentation of the incident. More about the " +"Community Council can be found in the guidelines [2]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:230 +msgid "" +"If you are subject to or witness unacceptable behavior, or have any other " +"concerns, please notify the Community Council as soon as possible. You can " +"contact the community council in person, or at tor-community-" +"council(a)lists.torproject.org. Current councilmembers are listed on the wiki " +"[1]. The Community Council's incident response will vary on a case-by-case " +"basis. The council will make every effort to respond to the incident " +"immediately. The council will prioritize the safety of the person who has " +"been harmed, or is at risk of harm. Person(s) who have been harmed or are at" +" risk of harm can withdraw the incident report at any time. We will never do" +" anything without the consent of the person who has been harmed or is at " +"risk of harm, except in situations where there is a threat of imminent " +"danger or harm to anyone. More information about the Community Council's " +"incident reporting and response policies can be found on their wiki [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" +"7. Què pot esperar la persona que informa d'una violació\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:242 +msgid "" +"The Community Council prioritizes the safety and well-being of any person " +"who feels that they have been harmed or may be in danger of being harmed. " +"Anyone reporting an issue to the Community Council can expect that their " +"report will be taken seriously. Initial reports can be taken in written or " +"verbal form. If the incident does not require an immediate resolution, then " +"a written report can be shared with the Community Council in an encrypted " +"format. The next steps in an incident response will vary on a case-by-case " +"basis." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:245 +#, no-wrap +msgid "" +"8. How the Community Council responds to incidents\n" +"============================================================\n" +msgstr "" +"8. Com respon el consell de la comunitat als incidents\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:252 +msgid "" +"If a community member engages in unacceptable behavior, the Community " +"Council may take any action they deem appropriate, including but not limited" +" to a warning, informal mediation, temporary ban or permanent expulsion from" +" the community. Any actions and decisions by the Community Council may be " +"appealed by following the appeals process in the Community Council " +"Guidelines [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" +"9. Àmbit d'aquest document\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:258 +msgid "This code of conduct covers all community participants:" +msgstr "" +"Aquest codi de conducta cobreix totes els participants de la comunitat:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:260 +msgid "paid and unpaid contributors" +msgstr "col·laboradors, a sou o sense" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:262 +msgid "sponsors" +msgstr "patrocinadors" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:264 +msgid "other guests" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:266 +msgid "when interacting:" +msgstr "en interactuar:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:268 +msgid "in all online and in-person community venues" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:270 +msgid "in one-on-one communications that relate to community work" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:277 +msgid "" +"This code of conduct and its related procedures also applies to unacceptable" +" behavior occurring outside the scope of community activities when such " +"behavior has the potential to adversely affect the safety and well-being of " +"community members. As members of the Tor community, we support and follow " +"this Code while we are working on Tor, and take care not to undermine it in " +"the rest of our time." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:280 +#, no-wrap +msgid "" +"10. License and attribution\n" +"============================================================\n" +msgstr "" +"10. Llicència i atribució\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:284 +msgid "" +"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " +"International license." +msgstr "" +"Aquest codi de conducta es comparteix sota la llicència Creative Commons " +"internacional CC-BY-SA 4.0." + +#. type: Plain text +#: ../code_of_conduct.txt:287 +msgid "" +"This code of conduct uses some language and framing from the Citizen Code of" +" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:289 +msgid "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…" +msgstr ""

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] fixup! Bug 28885: notify users that update is downloading
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit 03e81dff562d9eda9c056066a50089fdee325dd9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 22 14:45:04 2019 -0400 fixup! Bug 28885: notify users that update is downloading --- browser/themes/shared/customizableui/panelUI.inc.css | 2 ++ browser/themes/shared/notification-icons.inc.css | 1 + 2 files changed, 3 insertions(+) diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 977e27cf7c98..7ac4b76f663a 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -81,6 +81,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; @@ -91,6 +92,7 @@ } .panel-banner-item[notificationid="update-available"]::after, +.panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, .panel-banner-item[notificationid="update-restart"]::after { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index cf857d9de815..6d461a89488c 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -379,6 +379,7 @@ html|*#webRTC-previewVideo { /* UPDATE */ .popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], .popup-notification-icon[popupid="update-restart"] { background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center;

1 0

[tor/master] scripts/git: Pass all unrecognised arguments to git-push-all.sh
by dgoulet＠torproject.org 23 Oct '19

23 Oct '19

commit 9a3b768faebd5b4c55fe0626f8219b228e98bf0e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 12:58:15 2019 +1000 scripts/git: Pass all unrecognised arguments to git-push-all.sh This makes the behaviour of git-push-all.sh -n identical to the other git scripts. Part of 32216. --- scripts/git/git-push-all.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 7e67f4c96..1b20a50b7 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -29,6 +29,8 @@ function usage() echo " CI environment failures, using code that previously passed CI." echo " (default: skip; current: $CURRENT_PUSH_SAME matching branches)" echo " --: pass further arguments to git push." + echo " All unrecognised arguments are passed to git push, but complex" + echo " arguments before -- may be mangled by getopt." echo " (default: git push --atomic, current: $GIT_PUSH)" echo echo " env vars:" @@ -127,9 +129,11 @@ while getopts ":hr:st:" opt; do OPTIND=$((OPTIND - 2)) ;; *) - # Assume we're done with script arguments, - # and git push will handle the option - break + # Make git push handle the option + # This might mangle options with spaces, use -- for complex options + GIT_PUSH="$GIT_PUSH $1" + shift + OPTIND=$((OPTIND - 1)) ;; esac done

1 0

[tor/master] scripts/git: Make git-push-all.sh skip more branches that match upstream
by dgoulet＠torproject.org 23 Oct '19

23 Oct '19

commit 4f6f006c99e875e48a31ad1c62233561780d9e0b Author: teor <teor(a)torproject.org> Date: Wed Oct 23 13:26:07 2019 +1000 scripts/git: Make git-push-all.sh skip more branches that match upstream The script now skips master, maint-* and release-* branches that match upstream, not just test branches. And fix "no branches" bugs that this change makes happen more often. Part of 32216. --- scripts/git/git-push-all.sh | 53 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 1b20a50b7..feb0c3031 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -233,20 +233,31 @@ fi # Entry point # ############### -# Skip the test branches that are the same as the upstream branches -if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then +if [ "$TEST_BRANCH_PREFIX" ]; then + # Skip the test branches that are the same as the default or current + # upstream branches (they have already been tested) + UPSTREAM_SKIP_SAME_AS="$UPSTREAM_BRANCHES $DEFAULT_UPSTREAM_BRANCHES" +else + # Skip the local maint-*, release-*, master branches that are the same as the + # current upstream branches, but ignore the default upstream + # (we want to update a non-default remote, even if it matches the default) + UPSTREAM_SKIP_SAME_AS="$UPSTREAM_BRANCHES" +fi + +# Skip branches that match the relevant upstream(s) +if [ "$PUSH_SAME" -eq 0 ]; then NEW_PUSH_BRANCHES= for b in $PUSH_BRANCHES; do PUSH_COMMIT=$(git rev-parse "$b") SKIP_UPSTREAM= - for u in $DEFAULT_UPSTREAM_BRANCHES $UPSTREAM_BRANCHES; do + for u in $UPSTREAM_SKIP_SAME_AS; do UPSTREAM_COMMIT=$(git rev-parse "$u") if [ "$PUSH_COMMIT" = "$UPSTREAM_COMMIT" ]; then SKIP_UPSTREAM="$u" fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s remote: %s\n" \ + printf "Skipping unchanged: %s matching remote: %s\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@ -259,6 +270,12 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then PUSH_BRANCHES=${NEW_PUSH_BRANCHES} fi +if [ ! "$PUSH_BRANCHES" ]; then + echo "No branches to push!" + # We expect the rest of the script to run without errors, even if there + # are no branches +fi + if [ "$PUSH_DELAY" -le 0 ]; then echo "Pushing $PUSH_BRANCHES" # We know that there are no spaces in any branch within $PUSH_BRANCHES, so @@ -271,21 +288,33 @@ if [ "$PUSH_DELAY" -le 0 ]; then else # Push the branches in optimal CI order, with a delay between each push PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) + MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) \ + || true # Skipped master branch if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) \ + || true # Skipped all maint branches RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ - "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" + tr "\n" " ") || true # Skipped all release branches else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ - "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) \ + || true # Skipped all maint test branches # No release branches RELEASE_BRANCHES= fi + if [ "$MASTER_BRANCH" ] || [ "$MAINT_BRANCHES" ] \ + || [ "$RELEASE_BRANCHES" ]; then + printf "Pushing with %ss delays, so CI runs in this order:\n" "$PUSH_DELAY" + if [ "$MASTER_BRANCH" ]; then + printf "%s\n" "$MASTER_BRANCH" + fi + if [ "$MAINT_BRANCHES" ]; then + printf "%s\n" "$MAINT_BRANCHES" + fi + if [ "$RELEASE_BRANCHES" ]; then + printf "%s\n" "$RELEASE_BRANCHES" + fi + fi $GIT_PUSH "$@" "$UPSTREAM_REMOTE" "$MASTER_BRANCH" sleep "$PUSH_DELAY" # shellcheck disable=SC2086

1 0