September 2017 - tor-commits - lists.torproject.org

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit 64c589cd2e4ee4cb49c0e87225e93ad7e173daaf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 19:48:44 2017 +0000 Update translations for tor-messenger-prefsdtd --- he/prefs.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/he/prefs.dtd b/he/prefs.dtd index 3fcc3c2bd..a2da2d3c4 100644 --- a/he/prefs.dtd +++ b/he/prefs.dtd @@ -12,11 +12,11 @@ <!ENTITY prefs.introSettings "הגדרות אלה תקפות לכל שיחות אחד-על-אחד."> <!ENTITY prefs.verifyNudge "תמיד הצק כדי לאמת את זהותו של בן-השיח שלך"> <!ENTITY prefs.emptyAccountList "אף חשבון לא הוגדר"> -<!ENTITY prefs.generate "צור"> -<!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> -<!ENTITY prefs.coniksServerPort "Port"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> -<!ENTITY prefs.coniksPrivateLookups "Private lookups"> -<!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file +<!ENTITY prefs.generate "חולל"> +<!ENTITY prefs.coniksConnection "חיבור"> +<!ENTITY prefs.coniksServerAddress "כתובת שרת"> +<!ENTITY prefs.coniksServerPort "פתחה"> +<!ENTITY prefs.coniksAccountPolicy "מדיניות חשבון"> +<!ENTITY prefs.coniksPoliciesForAccount "מדיניויות לחשבון:"> +<!ENTITY prefs.coniksPrivateLookups "חיפושים פרטיים"> +<!ENTITY prefs.coniksSignedKeyChange "שינוי של מפתח חתום"> \ No newline at end of file

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit 399471c8934cd278cdfe3fad209ae684a04a869f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 19:45:25 2017 +0000 Update translations for whisperback_completed --- he/he.po | 77 +++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/he/he.po b/he/he.po index b747840b8..bab4a4aa0 100644 --- a/he/he.po +++ b/he/he.po @@ -4,15 +4,16 @@ # # Translators: # Elifelet <arab.with.nargila(a)gmail.com>, 2013 +# ION, 2017 # Kunda, 2014 # yael gogol <yaelgogol(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-03-21 16:28+0000\n" -"Last-Translator: Kunda\n" +"POT-Creation-Date: 2017-03-20 12:09+0000\n" +"PO-Revision-Date: 2017-09-22 19:38+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,58 +25,74 @@ msgstr "" #: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" -msgstr "אימייל לא תקין: %s" +msgstr "דוא\"ל בלתי תקף של קשר: %s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "מפתח OpenPGP לא תקין של איש קשר: %s" +msgstr "מפתח OpenPGP בלתי תקף של איש קשר: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" -msgstr "מפתח ציבורי OpenPGP לא תקין של איש קשר" +msgstr "מפתח ציבורי OpenPGP בלתי תקף של איש קשר" #: ../whisperBack/exceptions.py:41 #, python-format msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "המשתנים %s‎ לא נמצאו באף אחד מקבצי הקונפיגורציה: /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "המשתנה %s‎ לא נמצא באף אחד מקבצי התצורה /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:148 +#: ../whisperBack/gui.py:110 +msgid "Name of the affected software" +msgstr "שם של התוכנית המושפעת" + +#: ../whisperBack/gui.py:112 +msgid "Exact steps to reproduce the error" +msgstr "צעדים מדויקים לשעתוק השגיאה" + +#: ../whisperBack/gui.py:114 +msgid "Actual result and description of the error" +msgstr "תוצאה ממשית ותיאור של השגיאה" + +#: ../whisperBack/gui.py:116 +msgid "Desired result" +msgstr "תוצאה רצויה" + +#: ../whisperBack/gui.py:152 msgid "Unable to load a valid configuration." msgstr "לא מתאפשר לטעון הגדרה לא תקינה." -#: ../whisperBack/gui.py:214 +#: ../whisperBack/gui.py:218 msgid "Sending mail..." msgstr "שולח מייל..." -#: ../whisperBack/gui.py:215 +#: ../whisperBack/gui.py:219 msgid "Sending mail" msgstr "שולח מייל" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:221 msgid "This could take a while..." msgstr "זה יכול לקחת קצת זמן.." -#: ../whisperBack/gui.py:232 +#: ../whisperBack/gui.py:236 msgid "The contact email adress doesn't seem valid." msgstr "כתובת המייל של איש הקשר לא נראית תקינה" -#: ../whisperBack/gui.py:249 +#: ../whisperBack/gui.py:253 msgid "Unable to send the mail: SMTP error." msgstr "אי אפשר לשלוח את המייל: שגיאת SMTP." -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:255 msgid "Unable to connect to the server." msgstr "אי אפשר להתחבר לשרת." -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:257 msgid "Unable to create or to send the mail." msgstr "אי אפשר ליצור או לשלוח מייל." -#: ../whisperBack/gui.py:256 +#: ../whisperBack/gui.py:260 msgid "" "\n" "\n" @@ -84,20 +101,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\nדיווח התקלה לא יכל להשלח, כנראה בשל בעיות רשת. בבקשה נסה להתחבר מחדש לרשת ולחץ שלח שוב. אם זה לא עובד, יציעו לך לשמור את דיווח התקלה" -#: ../whisperBack/gui.py:269 +#: ../whisperBack/gui.py:273 msgid "Your message has been sent." msgstr "ההודעה שלך נשלחה." -#: ../whisperBack/gui.py:276 +#: ../whisperBack/gui.py:280 msgid "An error occured during encryption." -msgstr "שגיאה קרתה במהלך ההצפנה." +msgstr "שגיאה התרחשה במהלך ההצפנה." -#: ../whisperBack/gui.py:296 +#: ../whisperBack/gui.py:300 #, python-format msgid "Unable to save %s." msgstr "אי אפשר לשמור %s." -#: ../whisperBack/gui.py:319 +#: ../whisperBack/gui.py:323 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -107,27 +124,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "דיווח התקלה לא יכל להשלח, כנראה בשל בעיות רשת. \n אתה יכול לשמור את דיווח התקלה כקובץ בUSB drive ולנסות לשלוח לנו אותו ב %s מחשבון האימייל שלך על ידי שימוש במערכת אחרת. שים לב שדיוחח התקלה שלך לא יהיה אנונימי בעשייתך זאת אלא אם כן תבצע מספר צעדים בעצמך (למשל שימוש ב Tor עם חשבון אימייל throw-away). האם אתה רוצה לשמור את דיווח התקלה לקובץ?" -#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:383 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:384 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." -msgstr "שלח משוב במייל מוצפן." +msgstr "שלח משוב בדוא\"ל מוצפן." -#: ../whisperBack/gui.py:383 +#: ../whisperBack/gui.py:387 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "כל הזכויות שמורות © 2009-2012 למפתחי Tails \n (tails(a)boum.org)" -#: ../whisperBack/gui.py:384 +#: ../whisperBack/gui.py:388 msgid "Tails developers <tails(a)boum.org>" msgstr "מפתחי tails(a)boum.org> Tails >" -#: ../whisperBack/gui.py:385 +#: ../whisperBack/gui.py:389 msgid "translator-credits" msgstr "קרדיטים למתרגם" -#: ../whisperBack/gui.py:412 +#: ../whisperBack/gui.py:417 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "מפתח ה OpenPGP או שורת הכתובת לא תקפים" @@ -174,11 +191,11 @@ msgstr "תיאור תקלה." #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "כתובת מייל אפשרית לתקשר איתך" +msgstr "כתובת דוא\"ל רשותית לתקשר איתך" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "מפתח PGP אפשרי" +msgstr "מפתח PGP רשותי" #: ../data/whisperback.ui.h:26 msgid "Technical details to include"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit aa752a8581eff8c39546ba07f31c5137a15e9b59 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 19:45:19 2017 +0000 Update translations for whisperback --- he/he.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/he/he.po b/he/he.po index 81904bc06..bab4a4aa0 100644 --- a/he/he.po +++ b/he/he.po @@ -4,6 +4,7 @@ # # Translators: # Elifelet <arab.with.nargila(a)gmail.com>, 2013 +# ION, 2017 # Kunda, 2014 # yael gogol <yaelgogol(a)gmail.com>, 2012 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 14:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-22 19:38+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,39 +25,39 @@ msgstr "" #: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" -msgstr "אימייל לא תקין: %s" +msgstr "דוא\"ל בלתי תקף של קשר: %s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "מפתח OpenPGP לא תקין של איש קשר: %s" +msgstr "מפתח OpenPGP בלתי תקף של איש קשר: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" -msgstr "מפתח ציבורי OpenPGP לא תקין של איש קשר" +msgstr "מפתח ציבורי OpenPGP בלתי תקף של איש קשר" #: ../whisperBack/exceptions.py:41 #, python-format msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "המשתנים %s‎ לא נמצאו באף אחד מקבצי הקונפיגורציה: /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "המשתנה %s‎ לא נמצא באף אחד מקבצי התצורה /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:110 msgid "Name of the affected software" -msgstr "" +msgstr "שם של התוכנית המושפעת" #: ../whisperBack/gui.py:112 msgid "Exact steps to reproduce the error" -msgstr "" +msgstr "צעדים מדויקים לשעתוק השגיאה" #: ../whisperBack/gui.py:114 msgid "Actual result and description of the error" -msgstr "" +msgstr "תוצאה ממשית ותיאור של השגיאה" #: ../whisperBack/gui.py:116 msgid "Desired result" -msgstr "" +msgstr "תוצאה רצויה" #: ../whisperBack/gui.py:152 msgid "Unable to load a valid configuration." @@ -106,7 +107,7 @@ msgstr "ההודעה שלך נשלחה." #: ../whisperBack/gui.py:280 msgid "An error occured during encryption." -msgstr "שגיאה קרתה במהלך ההצפנה." +msgstr "שגיאה התרחשה במהלך ההצפנה." #: ../whisperBack/gui.py:300 #, python-format @@ -129,7 +130,7 @@ msgstr "WhisperBack" #: ../whisperBack/gui.py:384 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." -msgstr "שלח משוב במייל מוצפן." +msgstr "שלח משוב בדוא\"ל מוצפן." #: ../whisperBack/gui.py:387 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" @@ -190,11 +191,11 @@ msgstr "תיאור תקלה." #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "כתובת מייל אפשרית לתקשר איתך" +msgstr "כתובת דוא\"ל רשותית לתקשר איתך" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "מפתח PGP אפשרי" +msgstr "מפתח PGP רשותי" #: ../data/whisperback.ui.h:26 msgid "Technical details to include"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit f7116af96b1a9d7cd562207b1ae50ddd87ad34ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 19:19:28 2017 +0000 Update translations for tor-browser-manual --- he/he.po | 69 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/he/he.po b/he/he.po index 8382e130a..386c03111 100644 --- a/he/he.po +++ b/he/he.po @@ -3,13 +3,13 @@ # yael gogol <yaelgogol(a)gmail.com>, 2016 # Johnny Diralenzo <etcjcysu(a)sharklasers.com>, 2016 # Jacob Paikin <jacobpa9(a)gmail.com>, 2016 -# ION <zzz_aviv(a)yahoo.com>, 2017 +# ION <zzz_aviv(a)yahoo.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: ION <zzz_aviv(a)yahoo.com>, 2017\n" +"Last-Translator: ION <zzz_aviv(a)yahoo.com>, 2016\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" @@ -28,7 +28,7 @@ msgstr "" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "" +msgstr "אודות דפדפן Tor" #: about-tor-browser.page:12 msgid "" @@ -66,7 +66,7 @@ msgstr "" #: about-tor-browser.page:50 msgid "How Tor works" -msgstr "כיצד Tor פועל" +msgstr "איך Tor עובד" #: about-tor-browser.page:52 msgid "" @@ -251,7 +251,7 @@ msgstr "" #: circumvention.page:60 msgid "Which transport should I use?" -msgstr "" +msgstr "באיזו תעבורה עליי להשתמש?" #: circumvention.page:61 msgid "" @@ -278,7 +278,7 @@ msgstr "" #: downloading.page:7 msgid "How to download Tor Browser" -msgstr "" +msgstr "איך להוריד את דפדפן Tor" #: downloading.page:10 msgid "Downloading" @@ -301,7 +301,7 @@ msgstr "" #: downloading.page:27 msgid "GetTor" -msgstr "" +msgstr "GetTor" #: downloading.page:28 msgid "" @@ -312,7 +312,7 @@ msgstr "" #: downloading.page:34 msgid "To use GetTor via email:" -msgstr "" +msgstr "כדי להשתמש ב-GetTor דרך דוא\"ל:" #: downloading.page:39 msgid "" @@ -333,7 +333,7 @@ msgstr "" #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "כדי להשתמש ב-GetTor דרך טוויטר:" #: downloading.page:62 msgid "" @@ -402,11 +402,11 @@ msgstr "" #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" -msgstr "" +msgstr "למד כיצד להשתמש בדפדפן Tor בפעם הראשונה" #: first-time.page:10 msgid "Running Tor Browser for the first time" -msgstr "" +msgstr "מריץ את דפדפן Tor בפעם הראשונה" #: first-time.page:12 msgid "" @@ -499,11 +499,11 @@ msgstr "מדריך משתמש של דפדפן Tor" #: known-issues.page:6 msgid "A list of known issues." -msgstr "" +msgstr "רשימת סוגיות ידועות." #: known-issues.page:10 msgid "Known Issues" -msgstr "" +msgstr "סוגיות ידועות" #: known-issues.page:14 msgid "" @@ -518,19 +518,19 @@ msgstr "" #: known-issues.page:23 msgid "Webroot SecureAnywhere" -msgstr "" +msgstr "Webroot SecureAnywhere" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" -msgstr "" +msgstr "Kaspersky אבטחת אינטרנט 2012" #: known-issues.page:29 msgid "Sophos Antivirus for Mac" -msgstr "" +msgstr "Sophos נגד-נגיפים עבור Mac" #: known-issues.page:32 msgid "Microsoft Security Essentials" -msgstr "" +msgstr "Microsoft Security Essentials" #: known-issues.page:37 msgid "" @@ -569,14 +569,17 @@ msgid "" " ./start-tor-browser.desktop\n" " " msgstr "" +"\n" +" ./start-tor-browser.desktop\n" +" " #: managing-identities.page:6 msgid "Learn how to control personally-identifying information in Tor Browser" -msgstr "" +msgstr "למד כיצד לשלוט במידע מזהה-אישית בדפדפן Tor" #: managing-identities.page:10 msgid "Managing identities" -msgstr "" +msgstr "ניהול זהויות" #: managing-identities.page:12 msgid "" @@ -793,7 +796,7 @@ msgstr "" #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" -msgstr "" +msgstr "פתרון תקלות" #: onionsites.page:59 msgid "" @@ -822,7 +825,7 @@ msgstr "" #: plugins.page:10 msgid "Plugins, add-ons and JavaScript" -msgstr "" +msgstr "מתקעים, תוספים ו-JavaScript" #: plugins.page:13 msgid "Flash Player" @@ -910,7 +913,7 @@ msgstr "" #: secure-connections.page:12 msgid "Secure Connections" -msgstr "" +msgstr "חיבורים מאובטחים" #: secure-connections.page:14 msgid "" @@ -1213,7 +1216,7 @@ msgstr "" #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "" +msgstr "השבת באופן זמני את חומת האש שלך." #: troubleshooting.page:54 msgid "" @@ -1223,7 +1226,7 @@ msgstr "" #: troubleshooting.page:64 msgid "Is your connection censored?" -msgstr "" +msgstr "האם החיבור שלך מצונזר?" #: troubleshooting.page:65 msgid "" @@ -1234,7 +1237,7 @@ msgstr "" #: troubleshooting.page:74 msgid "Known issues" -msgstr "" +msgstr "סוגיות ידועות" #: troubleshooting.page:75 msgid "" @@ -1246,11 +1249,11 @@ msgstr "" #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "איך להסיר את דפדפן Tor מהמערכת שלך" #: uninstalling.page:10 msgid "Uninstalling" -msgstr "" +msgstr "מסיר" #: uninstalling.page:12 msgid "" @@ -1273,11 +1276,11 @@ msgstr "" #: uninstalling.page:32 msgid "Delete the Tor Browser folder." -msgstr "" +msgstr "מחק את תיקיית דפדפן Tor." #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "" +msgstr "רוקן את האשפה שלך" #: uninstalling.page:39 msgid "" @@ -1286,11 +1289,11 @@ msgstr "" #: updating.page:6 msgid "How to update Tor Browser" -msgstr "" +msgstr "איך לעדכן את דפדפן Tor" #: updating.page:10 msgid "Updating" -msgstr "" +msgstr "מעדכן" #: updating.page:12 msgid "" @@ -1309,7 +1312,7 @@ msgstr "" #: updating.page:26 msgid "Updating Tor Browser automatically" -msgstr "" +msgstr "מעדכן את דפדפן Tor באופן אוטומטי" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1364,7 +1367,7 @@ msgstr "" #: updating.page:58 msgid "Updating Tor Browser manually" -msgstr "" +msgstr "מעדכן את דפדפן Tor באופן ידני" #: updating.page:61 msgid ""

1 0

[tor/master] Mention even more about changes files in doc/HACKING
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit cbea334d6ba564c8b251ada832e26211f8172363 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 15:14:36 2017 -0400 Mention even more about changes files in doc/HACKING --- doc/HACKING/CodingStandards.md | 20 ++++++++++++++++++++ doc/HACKING/HowToReview.md | 3 +++ 2 files changed, 23 insertions(+) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 2980b775f..dd21d6fd2 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -100,6 +100,26 @@ you can use `make check-changes`. This is run automatically as part of `make check` -- if it fails, we must fix it before we release. These checks are implemented in `scripts/maint/lintChanges.py`. +Changes file style guide: + * Changes files begin with " o Header (subheading):". The header + should usually be "Minor/Major bugfixes/features". The subheading is a + particular area within Tor. See the ChangeLog for examples. + + * Make everything terse. + + * Write from the user's point of view: describe the user-visible changes + right away. + + * Mention configuration options by name. If they're rare or unusual, + remind people what they're for. + + * Describe changes in the present tense and in the imperative: not past. + + * Every bugfix should have a sentence of the form "Fixes bug 1234; bugfix + on 0.1.2.3-alpha", describing what bug was fixed and where it came from. + + * "Relays", not "servers", "nodes", or "Tor relays". + When we go to make a release, we will concatenate all the entries in changes to make a draft changelog, and clear the directory. We'll then edit the draft changelog into a nice readable format. diff --git a/doc/HACKING/HowToReview.md b/doc/HACKING/HowToReview.md index d53318942..2d1f3d1c9 100644 --- a/doc/HACKING/HowToReview.md +++ b/doc/HACKING/HowToReview.md @@ -19,6 +19,8 @@ Top-level smell-checks - Does `make check-spaces` pass? +- Does `make check-changes` pass? + - Does it have a reasonable amount of tests? Do they pass? Do they leak memory? @@ -32,6 +34,7 @@ Top-level smell-checks - If this changes Tor's behavior on the wire, is there a design proposal? +- If this changes anything in the code, is there a "changes" file? Let's look at the code!

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit 603769993843aedcbae5a58e6d21bf9b6c3d6985 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 18:47:53 2017 +0000 Update translations for torbutton-abouttorproperties_completed --- da/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/abouttor.properties b/da/abouttor.properties index eff067545..3f1e238f8 100644 --- a/da/abouttor.properties +++ b/da/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Donér nu! -aboutTor.donationBanner.slogan=Tor: Driver digital modstand. +aboutTor.donationBanner.slogan=Tor: Styrker digital oprør aboutTor.donationBanner.mozilla=Giv i dag og Mozilla vil matche din gave! aboutTor.donationBanner.tagline1=Beskytter journalister, whistleblowers og aktivister siden 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit 6271e1a7f3017b16686c5287b091c72e68cc4b49 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 18:47:48 2017 +0000 Update translations for torbutton-abouttorproperties --- da/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/abouttor.properties b/da/abouttor.properties index ed4ebccf0..3f1e238f8 100644 --- a/da/abouttor.properties +++ b/da/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Donér nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Styrker digital oprør aboutTor.donationBanner.mozilla=Giv i dag og Mozilla vil matche din gave! aboutTor.donationBanner.tagline1=Beskytter journalister, whistleblowers og aktivister siden 2006

1 0

[ooni-probe/master] Feature/http request headers (#730)
by art＠torproject.org 22 Sep '17

22 Sep '17

commit ba5846af10d337924b4f0ea06b5d0df0ee072465 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Feb 2 15:48:17 2017 +0000 Feature/http request headers (#730) * Write a failing unittest demonstrating the bug * Fix bug that leads to Headers not being preserved across redirects * Fix backward compatibility with twisted < 15.0.0 when handling redirects * Skip the redirect test when the network is absent * Pass request headers to web_connectivity test helper * Fix backend unittest --- ooni/backend_client.py | 10 ++++++++-- ooni/nettests/blocking/web_connectivity.py | 3 ++- ooni/tests/test_backend_client.py | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ooni/backend_client.py b/ooni/backend_client.py index 5298e7cf..4df5ff9c 100644 --- a/ooni/backend_client.py +++ b/ooni/backend_client.py @@ -267,10 +267,16 @@ class WebConnectivityClient(OONIBClient): return d - def control(self, http_request, tcp_connect): + def control(self, http_request, tcp_connect, + http_request_headers=None, + include_http_responses=False): + if http_request_headers is None: + http_request_headers = {} request = { 'http_request': http_request, - 'tcp_connect': tcp_connect + 'tcp_connect': tcp_connect, + 'http_request_headers': http_request_headers, + 'include_http_responses': include_http_responses } return self.queryBackend('POST', '/', query=request) diff --git a/ooni/nettests/blocking/web_connectivity.py b/ooni/nettests/blocking/web_connectivity.py index c7e59776..e5085380 100644 --- a/ooni/nettests/blocking/web_connectivity.py +++ b/ooni/nettests/blocking/web_connectivity.py @@ -229,7 +229,8 @@ class WebConnectivityTest(httpt.HTTPTest, dnst.DNSTest): log.msg("* performing control request with backend") self.control = yield self.web_connectivity_client.control( http_request=self.input, - tcp_connect=sockets + tcp_connect=sockets, + http_request_headers=REQUEST_HEADERS ) self.report['control'] = self.control diff --git a/ooni/tests/test_backend_client.py b/ooni/tests/test_backend_client.py index fab1fa21..8e479467 100644 --- a/ooni/tests/test_backend_client.py +++ b/ooni/tests/test_backend_client.py @@ -163,7 +163,9 @@ class TestBackendClient(ConfigTestCase): 'POST', '/', query={ "http_request": "http://example.com/", - "tcp_connect": ["127.0.0.1:8080", "127.0.0.1:8082"] + "tcp_connect": ["127.0.0.1:8080", "127.0.0.1:8082"], + "http_request_headers": {}, + "include_http_responses": False })

1 0

[ooni-probe/master] [chore] Update changelog
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 31e983ad8ed5f83b5a30f2b13cbb797bd9737979 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Feb 6 17:36:36 2017 +0000 [chore] Update changelog * Update manpages * Edit version in Makefile --- ChangeLog.rst | 19 +++++++++++++++++++ Makefile | 2 +- data/oonideckgen.1 | 2 +- data/ooniprobe-agent.1 | 2 +- data/ooniprobe.1 | 4 ++-- data/oonireport.1 | 2 +- data/ooniresources.1 | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 36621e68..940d3a45 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,25 @@ Changelog ========= +v2.2.0-rc.0 (Mon, 6 Feb 2017) +------------------------------ + +Feature list: + +* Major improvements to the web user interface + +* Support for showing progress of ongoing measurements + +* Add icons to decks + +* Show in measurements view the deck that generated a certain test + +* Support unix-socket tor control ports #479 (thanks @ioef) + +* Better explaination for -g option #498 (thanks @ioef) + +* Improvements to some docstring (thanks @donald213) + v2.1.0 (Wed, 7 Dec 2016) ------------------------------ Feature list: diff --git a/Makefile b/Makefile index 2fbd3088..60c54bce 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 2.1.0 +VERSION = 2.2.0rc0 man: cd docs && make man diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 index 822ead41..3f618562 100644 --- a/data/oonideckgen.1 +++ b/data/oonideckgen.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "OONIDECKGEN" "1" "Dec 07, 2016" "2.1.0" "OONI: Open Observatory of Network Interference" +.TH "OONIDECKGEN" "1" "Feb 06, 2017" "2.2.0.rc0" "OONI: Open Observatory of Network Interference" .SH NAME oonideckgen \- DEPRECATED ooni tool . diff --git a/data/ooniprobe-agent.1 b/data/ooniprobe-agent.1 index 079d5058..45905d45 100644 --- a/data/ooniprobe-agent.1 +++ b/data/ooniprobe-agent.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "OONIPROBE-AGENT" "1" "Dec 07, 2016" "2.1.0" "OONI: Open Observatory of Network Interference" +.TH "OONIPROBE-AGENT" "1" "Feb 06, 2017" "2.2.0.rc0" "OONI: Open Observatory of Network Interference" .SH NAME ooniprobe-agent \- an internet censorship measurement tool, system daemon. . diff --git a/data/ooniprobe.1 b/data/ooniprobe.1 index cee88177..a50f3774 100644 --- a/data/ooniprobe.1 +++ b/data/ooniprobe.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "OONIPROBE" "1" "Dec 07, 2016" "2.1.0" "OONI: Open Observatory of Network Interference" +.TH "OONIPROBE" "1" "Feb 06, 2017" "2.2.0.rc0" "OONI: Open Observatory of Network Interference" .SH NAME ooniprobe \- an internet censorship measurement tool . @@ -51,7 +51,7 @@ Disable writing to collector Disable writing to disk .TP .B \-g\fP,\fB \-\-no\-geoip -Disable geoip lookup on start +Disable geoip lookup on start. Warning: By using this option the IP address of the user executing ooniprobe is not excluded from the report. .TP .B \-s\fP,\fB \-\-list diff --git a/data/oonireport.1 b/data/oonireport.1 index c3d3d1d8..7c344183 100644 --- a/data/oonireport.1 +++ b/data/oonireport.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "OONIREPORT" "1" "Dec 07, 2016" "2.1.0" "OONI: Open Observatory of Network Interference" +.TH "OONIREPORT" "1" "Feb 06, 2017" "2.2.0.rc0" "OONI: Open Observatory of Network Interference" .SH NAME oonireport \- upload ooniprobe measurements . diff --git a/data/ooniresources.1 b/data/ooniresources.1 index 32e5b7c8..ee15baeb 100644 --- a/data/ooniresources.1 +++ b/data/ooniresources.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "OONIRESOURCES" "1" "Dec 07, 2016" "2.1.0" "OONI: Open Observatory of Network Interference" +.TH "OONIRESOURCES" "1" "Feb 06, 2017" "2.2.0.rc0" "OONI: Open Observatory of Network Interference" .SH NAME ooniresources \- DEPRECATED ooni tool .

1 0

[ooni-probe/master] Convert non fatal error messages into info level logs
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 44ebb4dacbdf356a237ad30649c4d2459b11b5e3 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Jan 30 22:48:30 2017 +0000 Convert non fatal error messages into info level logs --- ooni/nettests/blocking/web_connectivity.py | 2 +- ooni/templates/httpt.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/blocking/web_connectivity.py b/ooni/nettests/blocking/web_connectivity.py index c3877d4a..c7e59776 100644 --- a/ooni/nettests/blocking/web_connectivity.py +++ b/ooni/nettests/blocking/web_connectivity.py @@ -468,7 +468,7 @@ class WebConnectivityTest(httpt.HTTPTest, dnst.DNSTest): @experiment_http.addErrback def http_experiment_err(failure): failure_string = failureToString(failure) - log.err("Failed to perform HTTP request %s" % failure_string) + log.msg("Failed to perform HTTP request %s" % failure_string) self.report['http_experiment_failure'] = failure_string experiment_http_response = yield experiment_http diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index b9308b78..47d5b955 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -378,9 +378,9 @@ class HTTPTest(NetTestCase): def errback(failure, request): if request['tor']['is_tor']: - log.err("Error performing torified HTTP request: %s" % request['url']) + log.msg("Error performing torified HTTP request: %s" % request['url']) else: - log.err("Error performing HTTP request: %s" % request['url']) + log.msg("Error performing HTTP request: %s" % request['url']) failure_string = handleAllFailures(failure) previous_response = None if getattr(failure, "previousResponse", None):

1 0