[tor-commits] [translation/torcheck] Update translations for torcheck

2018-09-25 Thread translation
commit 18dfc4832805e318067547fc2a493e1130139216
Author: Translation commit bot 
Date:   Wed Sep 26 01:18:20 2018 +

Update translations for torcheck
---
 ka/torcheck.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/torcheck.po b/ka/torcheck.po
index 16cb35c93..ac2166671 100644
--- a/ka/torcheck.po
+++ b/ka/torcheck.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-09-24 18:36+\n"
+"PO-Revision-Date: 2018-09-26 00:58+\n"
 "Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr "სამწუხაროდ თქვენი 
მოთხოვნ
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
 "address is a https://www.torproject.org/\;>Tor node."
-msgstr ""
+msgstr "მომსახურების დროებითი 
შეფერხების გამო, ვერ მოხერხდა 
დადგენა, წარმოადგენს თუ არა 
თქვენი IP-მისამართი https://www.torproject.org/\;>Tor-ის კვანძს."
 
 msgid "Your IP address appears to be: "
 msgstr "თქვენი IP-მისამართი უნდა 
იყოს:"
@@ -62,12 +62,12 @@ msgid "This page is also available in the following 
languages:"
 msgstr "ეს გვერდი ასევე 
ხელმისაწვდომია შემდეგ 
ენებზე:"
 
 msgid "For more information about this exit relay, see:"
-msgstr ""
+msgstr "ვრცლად, გამსვლელი წერ
ტილის შესახებ, იხილეთ:"
 
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr ""
+msgstr "Tor-პროექტი წარმოადგენს აშშ 
501(c)(3) არამომგებიან ორ
განიზაციას, რომელიც ხელს 
უწყობს კვლევების წარმოებას, 
სიახლეების შემუშავებასა და 
განათლების დონის ამაღლებას, 
ინტერნეტში ვინაობისა და პირ
ადი მონაცემების 
გამჟღავნებისგან დაცვის 
საკითხებში."
 
 msgid "Learn More "
 msgstr "იხილეთ ვრცლად "
@@ -97,7 +97,7 @@ msgid "However, it does not appear to be Tor Browser."
 msgstr "სავარაუდოდ, არ უნდა იყოს 
Tor-ბრაუზერი"
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "გადამცემის ამოქმედება"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "ვინაობის გაუმჟღავნებლად"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2018-09-25 Thread translation
commit 85238e29a02d27c531a2a02887c9263ff3d17640
Author: Translation commit bot 
Date:   Wed Sep 26 01:18:25 2018 +

Update translations for torcheck_completed
---
 ka/torcheck.po | 103 +
 1 file changed, 103 insertions(+)

diff --git a/ka/torcheck.po b/ka/torcheck.po
new file mode 100644
index 0..ac2166671
--- /dev/null
+++ b/ka/torcheck.po
@@ -0,0 +1,103 @@
+# TorCheck gettext template
+# Copyright (C) 2008-2013 The Tor Project, Inc
+# 
+# Translators:
+# A. C. , 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"POT-Creation-Date: 2012-02-16 20:28+PDT\n"
+"PO-Revision-Date: 2018-09-26 00:58+\n"
+"Last-Translator: A. C. \n"
+"Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+msgid "Congratulations. This browser is configured to use Tor."
+msgstr "გილოცავთ. ბრაუზერი სრულად 
გამართულია Tor-ით სარ
გებლობისთვის."
+
+msgid ""
+"Please refer to the https://www.torproject.org/\;>Tor website "
+"for further information about using Tor safely.  You are now free to browse "
+"the Internet anonymously."
+msgstr "გთხოვთ ეწვიოთ https://www.torproject.org/\;>Tor-ის ვებსაიტს 
დამატებითი ინფორმაციის 
მისაღებად Tor-ით უსაფრთხო სარ
გებლობის შესახებ. ახლა უკვე 
თავისუფლად შეგიძლიათ 
იმოგზაუროთ ინტერნეტში, 
ვინაობის გაუმჟღავნებლად."
+
+msgid "There is a security update available for Tor Browser."
+msgstr "ხელმისაწვდომია უსაფრ
თხოების განახლება Tor-ბრაუზერ
ისთვის."
+
+msgid ""
+"https://www.torproject.org/download/download-easy.html\;>Click "
+"here to go to the download page"
+msgstr "https://www.torproject.org/download/download-easy.html\;>დააწკაპეთ
 აქ ჩამოტვირთვის გვერდზე 
გადასასვლელად"
+
+msgid "Sorry. You are not using Tor."
+msgstr "სამწუხაროა. თქვენ არ 
იყენებთ Tor-ს."
+
+msgid ""
+"If you are attempting to use a Tor client, please refer to the https://www.torproject.org/\;>Tor website and specifically the https://www.torproject.org/docs/faq#DoesntWork\;>instructions for "
+"configuring your Tor client."
+msgstr "თუ ცდილობთ გამართოთ Tor-ის პრ
ოგრამა, გთხოვთ ეწვიოთ https://www.torproject.org/\;>Tor-ის ვებსაიტს 
და მიჰყვეთ შესაბამის https://www.torproject.org/docs/faq#DoesntWork\;>მითითებებს
 Tor-პროგრამის სწორად გასამარ
თად."
+
+msgid "Sorry, your query failed or an unexpected response was received."
+msgstr "სამწუხაროდ თქვენი 
მოთხოვნა ვერ დამუშავდა ან 
მიღებულია მოულოდნელი პასუხი 
სერვერიდან."
+
+msgid ""
+"A temporary service outage prevents us from determining if your source IP "
+"address is a https://www.torproject.org/\;>Tor node."
+msgstr "მომსახურების დროებითი 
შეფერხების გამო, ვერ მოხერხდა 
დადგენა, წარმოადგენს თუ არა 
თქვენი IP-მისამართი https://www.torproject.org/\;>Tor-ის კვანძს."
+
+msgid "Your IP address appears to be: "
+msgstr "თქვენი IP-მისამართი უნდა 
იყოს:"
+
+msgid "Are you using Tor?"
+msgstr "იყენებთ Tor-ს?"
+
+msgid "This page is also available in the following languages:"
+msgstr "ეს გვერდი ასევე 
ხელმისაწვდომია შემდეგ 
ენებზე:"
+
+msgid "For more information about this exit relay, see:"
+msgstr "ვრცლად, გამსვლელი წერ
ტილის შესახებ, იხილეთ:"
+
+msgid ""
+"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
+"development, and education of online anonymity and privacy."
+msgstr "Tor-პროექტი წარმოადგენს აშშ 
501(c)(3) არამომგებიან 

[tor-commits] [translation/whisperback] Update translations for whisperback

2018-09-25 Thread translation
commit 2e5f914ce0dc6e36847184bb6e4e9497a660221a
Author: Translation commit bot 
Date:   Wed Sep 26 01:18:46 2018 +

Update translations for whisperback
---
 ka/ka.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/ka.po b/ka/ka.po
index 69c9f8727..ed197a5f5 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-09-21 23:47+\n"
+"PO-Revision-Date: 2018-09-26 01:06+\n"
 "Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -140,7 +140,7 @@ msgstr ""
 
 #: ../whisperBack/gui.py:338
 msgid "translator-credits"
-msgstr ""
+msgstr "თარგმნის-მონაწილეები"
 
 #: ../whisperBack/gui.py:370
 msgid "This doesn't seem to be a valid URL or OpenPGP key."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-09-25 Thread translation
commit 022c0d9d5a984e5ae1ba12c83d82f982d748a387
Author: Translation commit bot 
Date:   Wed Sep 26 01:17:18 2018 +

Update translations for tor-browser-manual
---
 ka/ka.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/ka.po b/ka/ka.po
index 562fc7406..40647696f 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -17,7 +17,7 @@ msgstr ""
 #. Put one translator per line, in the form NAME , YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr ""
+msgstr "თარგმნის-მონაწილეები"
 
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
@@ -212,7 +212,7 @@ msgstr ""
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
-msgstr ""
+msgstr "მისაერთებელი 
გადამყვანების გამოყენება"
 
 #. 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
@@ -263,7 +263,7 @@ msgstr ""
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
-msgstr ""
+msgstr "რომელი გადამყვანი უნდა 
გამოვიყენო?"
 
 #: circumvention.page:61
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/exoneratorproperties] Update translations for exoneratorproperties

2018-09-25 Thread translation
commit 00e8c6f290872eb1875eea7166ec388171db3fe1
Author: Translation commit bot 
Date:   Wed Sep 26 00:45:19 2018 +

Update translations for exoneratorproperties
---
 ka/exonerator.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ka/exonerator.properties b/ka/exonerator.properties
index 1615de278..ced396375 100644
--- a/ka/exonerator.properties
+++ b/ka/exonerator.properties
@@ -15,12 +15,12 @@ summary.invalidparams.noip.title=IP-მისამარ
თის პარა
 summary.invalidparams.noip.body=ვწუხვართ, ასევე 
აუცილებელია IP-მისამართის პარ
ამეტრის მითითებაც.
 summary.invalidparams.timestamprange.title=თარიღის პარ
ამეტრი საზღვრებს ცდება
 summary.invalidparams.timestamprange.body=სამწუხაროდ, 
მონაცემთა ბაზაში არაფერი 
მოიძებნა %s თარიღით. გთხოვთ, 
შეარჩიოთ %s და %s შუალედში.
-summary.invalidparams.invalidip.title=IP მისამართის არ
ასწორი პარამეტრი
-summary.invalidparams.invalidip.body=Sorry, %s is not a valid IP address. The 
expected IP address formats are %s or %s.
+summary.invalidparams.invalidip.title=IP-მისამართის არ
ასწორი პარამეტრი
+summary.invalidparams.invalidip.body=სამწუხაროდ %s არ 
წარმოადგენს მართებულ 
IP-მისამართს. მოსალოდნელი 
IP-მისამართის უნდა იყოს %s ან %s 
სახის.
 summary.invalidparams.invalidtimestamp.title=არასწორი თარ
იღის პარამეტრი
-summary.invalidparams.invalidtimestamp.body=Sorry, %s is not a valid date. The 
expected date format is %s.
-summary.invalidparams.timestamptoorecent.title=Date parameter too recent
-summary.invalidparams.timestamptoorecent.body=The database may not yet contain 
enough data to correctly answer this request. The latest accepted data is the 
day before yesterday. Please repeat your search on another day.
+summary.invalidparams.invalidtimestamp.body=სამწუხაროდ %s 
არამართებული თარიღია. 
მოსალოდნელი თარიღი უნდა იყოს 
%s სახის.
+summary.invalidparams.timestamptoorecent.title=პარამეტრად, 
ზედმეტად ბოლოდროინდელი თარ
იღია
+summary.invalidparams.timestamptoorecent.body=მონაცემთა 
ბაზა, სავარაუდოდ ჯერ არ 
შეიცავს საკმარის მონაცემებს, 
ამ მოთხოვნის მართებულად 
საპასუხოდ. უახლესი მისაღები 
თარიღია, გუშინწინდელი. 
გთხოვთ, გაიმეოროთ ძიება სხვა 
დღისთვის.
 summary.serverproblem.nodata.title=სერვერის ხარ
ვეზი
 summary.serverproblem.nodata.body.text=The database does not contain any data 
for the requested date. Please try again later. If this problem persists, 
please %s!
 summary.serverproblem.nodata.body.link=გვაცნობეთ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

2018-09-25 Thread translation
commit 724561aa892e717ab1a046048f3adb7da86bb807
Author: Translation commit bot 
Date:   Wed Sep 26 00:18:19 2018 +

Update translations for torbutton-browseronboardingproperties_completed
---
 ka/browserOnboarding.properties | 54 +
 1 file changed, 54 insertions(+)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
new file mode 100644
index 0..c1c40e5ac
--- /dev/null
+++ b/ka/browserOnboarding.properties
@@ -0,0 +1,54 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=მოგესალმებით
+onboarding.tour-tor-welcome.title=თქვენ უკვე მზად 
ხართ.
+onboarding.tour-tor-welcome.description=Tor-ბრაუზერი 
გთავაზობთ უმაღლესი ხარისხის 
მომსახურებას, პირადი 
მონაცემების დაცვისა და უსაფრ
თხოების უზრუნველსაყოფად, 
გვერდების მონახულებისას. 
ახლა უკვე დაცული ხართ 
თვალთვალისგან, მეთვალყურ
ეობისა და ცენზურისგან. 
მოცემული მეგზური ყველაფერს 
განგიმარტავთ.
+onboarding.tour-tor-welcome.button=ახლავე დაწყება
+
+onboarding.tour-tor-privacy=პირადულობა
+onboarding.tour-tor-privacy.title=მოიცილეთ 
მეთვალყურეები და 
ცნობისმოყვარეები
+onboarding.tour-tor-privacy.description=Tor-ბრაუზერი 
აცალკევებს საიტის ფუნთუშებს 
და შლის მონახულებული გვერ
დების ისტორიას დახურ
ვისთანავე. მსგავსი 
დამატებული ცვლილებები უზრ
უნველყოფს პირადი 
მონაცემების დაცვისა და უსაფრ
თხოების მაღალ ხარისხს ბრ
აუზერში. დაწკაპეთ „Tor-ქსელი“ 
და იხილეთ, თუ როგორ ხდება 
დაცვა ქსელის დონეზე.
+onboarding.tour-tor-privacy.button=Tor-ქსელში შესვლა
+
+onboarding.tour-tor-network=Tor-ქსელი
+onboarding.tour-tor-network.title=ისარგებლეთ 
დამოუკიდებელი, ერთპიროვნული 
მმართველობისგან დაცული 
ქსელით.
+onboarding.tour-tor-network.description=Tor-ბრაუზერით 
უკავშირდებით Tor-ქსელს, რომლის 
მუშაობასაც უზრუნველყოფს 
ათასობით მოხალისე, მთელი 
მსოფლიოს მასშტაბით. 
განსხვავებით VPN-ისგან, ამ 
შემთხვევაში არ გიწევთ 
ცალკეული პირის ან ერთეულის 
ნდობა და არავისზე ხართ 
დამოკიდებული, გვერდების 
ვინაობის გაუმჟღავნებლად 
მონახულებისას.
+onboarding.tour-tor-network.button=წრედის 
საჩვენებელ არეზე გადასვლა
+
+onboarding.tour-tor-circuit-display=წრედის 
საჩვენებელი არე
+onboarding.tour-tor-circuit-display.title=იხილეთ 
თქვენი არხი.
+onboarding.tour-tor-circuit-display.description=თითოეულ 
მისამართზე გადასვლისას, 
მიმოცვლილი მონაცემები სრ
ულად გარდაიქმნება და იშიფრ
ება, მსოფლიოს ნებისმიერ წერ
ტილიდან შემთხვევით შერჩეული 
სამი Tor-გადამცემით შექმნილ წრ
ედში. ვებსაიტებს არ შეუძლიათ 
დაადგინონ, საიდან უკავშირ
დებით. ახალი წრედის 
მოთხოვნისთვის, წრედის არეში 
დაწკაპეთ „ახალი წრედი ამ 
საიტისთვის“.

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit 32d0966a802e10e02fe0c6a3b471dccd6d3d6dee
Author: Translation commit bot 
Date:   Wed Sep 26 00:18:15 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 43a1cd687..c1c40e5ac 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -23,7 +23,7 @@ 
onboarding.tour-tor-circuit-display.description=თითოეულ მის
 onboarding.tour-tor-circuit-display.button=არხის ნახვა
 
 onboarding.tour-tor-security=უსაფრთხოება
-onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.title=მოარგეთ საკუთარ 
მოთხოვნილებებს
 onboarding.tour-tor-security.description=ჩვენ ასევე 
გთავაზობთ დამატებით პარამეტრ
ებს, ბრაუზერის უსაფრთხოების 
კიდევ უფრო მეტად 
ასამაღლებლად. ჩვენი უსაფრ
თხოების პარამეტრები, 
საშუალებას გაძლევთ შეზღუდოთ 
გვერდის ის ნაწილები, რომლებიც 
თქვენს კომპიუტერზე 
შეტევისთვის შეიძლება 
გამოიყენონ. დაწკაპეთ ქვემოთ 
და იხილეთ ამ პარამეტრების 
შესახებ ვრცლად.
 onboarding.tour-tor-security.button=პარამეტრების 
გადახედვა
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/bridgedb] Update translations for bridgedb

2018-09-25 Thread translation
commit 4fccb64dff4ae7e04aa2f3aad527a06f3a2dd80f
Author: Translation commit bot 
Date:   Wed Sep 26 00:15:10 2018 +

Update translations for bridgedb
---
 fa/LC_MESSAGES/bridgedb.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index e676b1967..5491a6be8 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -13,14 +13,15 @@
 # Mehrad Rousta , 2018
 # Mohammad Hossein , 2014
 # perspolis , 2011
+# masoudd , 2018
 # Setareh , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-08-07 07:30+\n"
-"Last-Translator: Mehrad Rousta \n"
+"PO-Revision-Date: 2018-09-26 00:12+\n"
+"Last-Translator: masoudd \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +43,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "متاسفانه، در رابطه با درخواست شما 
خطایی رخ داده است."
+msgstr "متاسفانه در رابطه با درخواست شما خطایی 
رخ داده است."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/exoneratorproperties] Update translations for exoneratorproperties

2018-09-25 Thread translation
commit 12b11287bcee76b8280e359e2d6055bf82b0486f
Author: Translation commit bot 
Date:   Wed Sep 26 00:15:23 2018 +

Update translations for exoneratorproperties
---
 ka/exonerator.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/exonerator.properties b/ka/exonerator.properties
index 1c106285d..1615de278 100644
--- a/ka/exonerator.properties
+++ b/ka/exonerator.properties
@@ -7,14 +7,14 @@ summary.serverproblem.dbnoconnect.title=სერვერ
ის ხარვე
 summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. 
Please try again later. If this problem persists, please %s!
 summary.serverproblem.dbnoconnect.body.link=გვაცნობეთ
 summary.serverproblem.dbempty.title=სერვერის ხარ
ვეზი
-summary.serverproblem.dbempty.body.text=The database appears to be empty. 
Please try again later. If this problem persists, please %s!
+summary.serverproblem.dbempty.body.text=ჩანს, 
მონაცემთა ბაზა ცარიელია. 
გთხოვთ, სცადოთ მოგვიანებით. 
თუ ხარვეზი არ გამოსწორდება, 
გთხოვთ %s!
 summary.serverproblem.dbempty.body.link=გვაცნობეთ
 summary.invalidparams.notimestamp.title=თარიღის პარ
ამეტრი არ არის მოცემული
-summary.invalidparams.notimestamp.body=Sorry, you also need to provide a date 
parameter.
-summary.invalidparams.noip.title=IP მისამართის პარ
ამეტრი არ არის მიცემული
-summary.invalidparams.noip.body=Sorry, you also need to provide an IP address 
parameter.
-summary.invalidparams.timestamprange.title=Date parameter out of range
-summary.invalidparams.timestamprange.body=Sorry, the database does not contain 
any data from %s. Please pick a date between %s and %s.
+summary.invalidparams.notimestamp.body=ვწუხვართ, 
ასევე აუცილებელია თარიღის 
პარამეტრის მითითებაც.
+summary.invalidparams.noip.title=IP-მისამართის პარ
ამეტრი არაა მოცემული
+summary.invalidparams.noip.body=ვწუხვართ, ასევე 
აუცილებელია IP-მისამართის პარ
ამეტრის მითითებაც.
+summary.invalidparams.timestamprange.title=თარიღის პარ
ამეტრი საზღვრებს ცდება
+summary.invalidparams.timestamprange.body=სამწუხაროდ, 
მონაცემთა ბაზაში არაფერი 
მოიძებნა %s თარიღით. გთხოვთ, 
შეარჩიოთ %s და %s შუალედში.
 summary.invalidparams.invalidip.title=IP მისამართის არ
ასწორი პარამეტრი
 summary.invalidparams.invalidip.body=Sorry, %s is not a valid IP address. The 
expected IP address formats are %s or %s.
 summary.invalidparams.invalidtimestamp.title=არასწორი თარ
იღის პარამეტრი

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2018-09-25 Thread translation
commit 46745c3dc22d53b418d3b38d6752c9a9cb4b7c51
Author: Translation commit bot 
Date:   Wed Sep 26 00:15:17 2018 +

Update translations for bridgedb_completed
---
 fa/LC_MESSAGES/bridgedb.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index e676b1967..5491a6be8 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -13,14 +13,15 @@
 # Mehrad Rousta , 2018
 # Mohammad Hossein , 2014
 # perspolis , 2011
+# masoudd , 2018
 # Setareh , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-08-07 07:30+\n"
-"Last-Translator: Mehrad Rousta \n"
+"PO-Revision-Date: 2018-09-26 00:12+\n"
+"Last-Translator: masoudd \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +43,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "متاسفانه، در رابطه با درخواست شما 
خطایی رخ داده است."
+msgstr "متاسفانه در رابطه با درخواست شما خطایی 
رخ داده است."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit 3da2b2506fad36967357902db2f3275b8adac1f3
Author: Translation commit bot 
Date:   Tue Sep 25 23:48:08 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 7d35c2146..43a1cd687 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -19,15 +19,15 @@ onboarding.tour-tor-network.button=წრედის 
საჩვენებ
 
 onboarding.tour-tor-circuit-display=წრედის 
საჩვენებელი არე
 onboarding.tour-tor-circuit-display.title=იხილეთ 
თქვენი არხი.
-onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking ‘New Circuit for this Site’ on our 
Circuit Display.
+onboarding.tour-tor-circuit-display.description=თითოეულ 
მისამართზე გადასვლისას, 
მიმოცვლილი მონაცემები სრ
ულად გარდაიქმნება და იშიფრ
ება, მსოფლიოს ნებისმიერ წერ
ტილიდან შემთხვევით შერჩეული 
სამი Tor-გადამცემით შექმნილ წრ
ედში. ვებსაიტებს არ შეუძლიათ 
დაადგინონ, საიდან უკავშირ
დებით. ახალი წრედის 
მოთხოვნისთვის, წრედის არეში 
დაწკაპეთ „ახალი წრედი ამ 
საიტისთვის“.
 onboarding.tour-tor-circuit-display.button=არხის ნახვა
 
 onboarding.tour-tor-security=უსაფრთხოება
 onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=We also provide you with additional 
settings for bumping up your browser security. Our Security Settings allow you 
to block elements that could be used to attack your computer. Click below to 
see what the different options do.
+onboarding.tour-tor-security.description=ჩვენ ასევე 
გთავაზობთ დამატებით პარამეტრ
ებს, ბრაუზერის უსაფრთხოების 
კიდევ უფრო მეტად 
ასამაღლებლად. ჩვენი უსაფრ
თხოების პარამეტრები, 
საშუალებას გაძლევთ შეზღუდოთ 
გვერდის ის ნაწილები, რომლებიც 
თქვენს კომპიუტერზე 
შეტევისთვის შეიძლება 
გამოიყენონ. დაწკაპეთ ქვემოთ 
და იხილეთ ამ პარამეტრების 
შესახებ ვრცლად.
 onboarding.tour-tor-security.button=პარამეტრების 
გადახედვა
 
-onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences=გამოყენებასთან
 დაკავშირებული საკითხები
 onboarding.tour-tor-expect-differences.title=მოსალოდნელი 
ცვლილებები.
 onboarding.tour-tor-expect-differences.description=Tor-ის მიერ 
შემოთავაზებული უსაფრ
თხოებისა და პირადი 
მონაცემების დაცვის 
საშუალებებმა, შესაძლოა მცირე 
ცვლილებები გამოიწვიოს გვერ
დების მონახულებისას. ზოგიერ
თი რამ ცოტა შენელდება და 
თქვენ მიერ შერჩეული უსაფრ
თხოების დონიდან გამომდინარე, 
გვერდების ცალკეული ნაწილები 
არ იმუშავებს ან არ ჩაიტვირ
თება. ამასთან, საიტების 
ნაწილზე, შესაძლოა ხშირად 
მოგიწიოთ იმის დá
 ƒáƒ“ასტურება რომ ადამიანი ხართ 
და არა რობოტი.
 onboarding.tour-tor-expect-differences.button=იხილეთ ხ.დ.კ.


[tor-commits] [stem/master] Stub address in get_exit_policy unit test

2018-09-25 Thread atagar
commit febe3f4128b49f1380a8f32f23e3c5a8466582d3
Author: Damian Johnson 
Date:   Tue Sep 25 16:16:15 2018 -0700

Stub address in get_exit_policy unit test

Ok, got it. Jenkins test runs are failing because it's expanding 'reject
private:*' to a different address. Completely understandable, our unit
tests should hardcode a test address.
---
 test/unit/control/controller.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index 29be956f..ed00385d 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -218,7 +218,7 @@ class TestControl(unittest.TestCase):
   'reject 192.168.0.0/16:*',
   'reject 10.0.0.0/8:*',
   'reject 172.16.0.0/12:*',
-  'reject 127.0.1.1:*',
+  'reject 1.2.3.4:*',
   'accept *:80',
   'accept *:443',
   'accept 43.5.5.5:*',
@@ -233,7 +233,7 @@ class TestControl(unittest.TestCase):
 
 def getinfo_response(param, default = None):
   if param == 'address':
-return default
+return '1.2.3.4'
   elif param == 'exit-policy/default':
 return ''
   elif param == 'exit-policy/full' and exit_policy_exception:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit 4f3a8bb77f254f5f1fd4e1d0a11579f6433110c0
Author: Translation commit bot 
Date:   Tue Sep 25 23:18:07 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 3f810b5f9..7d35c2146 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -9,16 +9,16 @@ onboarding.tour-tor-welcome.button=ახლავე 
დაწყება
 
 onboarding.tour-tor-privacy=პირადულობა
 onboarding.tour-tor-privacy.title=მოიცილეთ 
მეთვალყურეები და 
ცნობისმოყვარეები
-onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click ‘Tor Network’ 
to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor-ბრაუზერი 
აცალკევებს საიტის ფუნთუშებს 
და შლის მონახულებული გვერ
დების ისტორიას დახურ
ვისთანავე. მსგავსი 
დამატებული ცვლილებები უზრ
უნველყოფს პირადი 
მონაცემების დაცვისა და უსაფრ
თხოების მაღალ ხარისხს ბრ
აუზერში. დაწკაპეთ „Tor-ქსელი“ 
და იხილეთ, თუ როგორ ხდება 
დაცვა ქსელის დონეზე.
 onboarding.tour-tor-privacy.button=Tor-ქსელში შესვლა
 
 onboarding.tour-tor-network=Tor-ქსელი
-onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
there’s no one point of failure or centralized entity you need to trust in 
order to enjoy the internet privately.
+onboarding.tour-tor-network.title=ისარგებლეთ 
დამოუკიდებელი, ერთპიროვნული 
მმართველობისგან დაცული 
ქსელით.
+onboarding.tour-tor-network.description=Tor-ბრაუზერით 
უკავშირდებით Tor-ქსელს, რომლის 
მუშაობასაც უზრუნველყოფს 
ათასობით მოხალისე, მთელი 
მსოფლიოს მასშტაბით. 
განსხვავებით VPN-ისგან, ამ 
შემთხვევაში არ გიწევთ 
ცალკეული პირის ან ერთეულის 
ნდობა და არავისზე ხართ 
დამოკიდებული, გვერდების 
ვინაობის გაუმჟღავნებლად 
მონახულებისას.
 onboarding.tour-tor-network.button=წრედის 
საჩვენებელ არეზე გადასვლა
 
 onboarding.tour-tor-circuit-display=წრედის 
საჩვენებელი არე
-onboarding.tour-tor-circuit-display.title=თქვენი არხის 
ნახვა.
+onboarding.tour-tor-circuit-display.title=იხილეთ 
თქვენი არხი.
 onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking ‘New Circuit for this Site’ on our 
Circuit Display.
 onboarding.tour-tor-circuit-display.button=არხის ნახვა
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [stem/master] Compare exit policy strings in unit tests

2018-09-25 Thread atagar
commit 45e88d45da2e5693108d56ac4a44884b45045e0a
Author: Damian Johnson 
Date:   Tue Sep 25 15:56:55 2018 -0700

Compare exit policy strings in unit tests

Oops, my prior commit made jenkins sad...


==
FAIL: test_get_exit_policy_if_not_relaying

--
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1305, 
in patched
  return func(*args, **keywargs)
  File 
"/srv/jenkins-workspace/workspace/stem-tor-ci/test/unit/control/controller.py", 
line 247, in test_get_exit_policy_if_not_relaying
  self.assertEqual(expected, self.controller.get_exit_policy())
AssertionError:  != 


--

No doubt I'm missing a mock. This isn't gonna fix that, but this should make
the assertion failure more helpful.
---
 test/unit/control/controller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index 0ae9fafd..29be956f 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -196,7 +196,7 @@ class TestControl(unittest.TestCase):
   'accept *:*',
 )
 
-self.assertEqual(expected, self.controller.get_exit_policy())
+self.assertEqual(str(expected), str(self.controller.get_exit_policy()))
 
   @patch('stem.control.Controller.get_info')
   @patch('stem.control.Controller.get_conf')
@@ -244,10 +244,10 @@ class TestControl(unittest.TestCase):
 get_info_mock.side_effect = getinfo_response
 
 exit_policy_exception = stem.OperationFailed('552', 'Not running in server 
mode')
-self.assertEqual(expected, self.controller.get_exit_policy())
+self.assertEqual(str(expected), str(self.controller.get_exit_policy()))
 
 exit_policy_exception = stem.OperationFailed('551', 'Descriptor still 
rebuilding - not ready yet')
-self.assertEqual(expected, self.controller.get_exit_policy())
+self.assertEqual(str(expected), str(self.controller.get_exit_policy()))
 
   @patch('stem.control.Controller.get_info')
   @patch('stem.control.Controller.get_conf')

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit 04e552ed3d9c4ad2da8875f59e66a3ccfe06d210
Author: Translation commit bot 
Date:   Tue Sep 25 22:48:09 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index c7328dc43..3f810b5f9 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -4,11 +4,11 @@
 
 onboarding.tour-tor-welcome=მოგესალმებით
 onboarding.tour-tor-welcome.title=თქვენ უკვე მზად 
ხართ.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest 
standard of privacy and security while browsing the web. You’re now protected 
against tracking, surveillance, and censorship. This quick onboarding will show 
you how.
+onboarding.tour-tor-welcome.description=Tor-ბრაუზერი 
გთავაზობთ უმაღლესი ხარისხის 
მომსახურებას, პირადი 
მონაცემების დაცვისა და უსაფრ
თხოების უზრუნველსაყოფად, 
გვერდების მონახულებისას. 
ახლა უკვე დაცული ხართ 
თვალთვალისგან, მეთვალყურ
ეობისა და ცენზურისგან. 
მოცემული მეგზური ყველაფერს 
განგიმარტავთ.
 onboarding.tour-tor-welcome.button=ახლავე დაწყება
 
 onboarding.tour-tor-privacy=პირადულობა
-onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.title=მოიცილეთ 
მეთვალყურეები და 
ცნობისმოყვარეები
 onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click ‘Tor Network’ 
to learn how we protect you on the network level.
 onboarding.tour-tor-privacy.button=Tor-ქსელში შესვლა
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit 4876f437b3088d018722ec031daf1f6502fee68c
Author: Translation commit bot 
Date:   Tue Sep 25 22:18:16 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 82f75fe71..c7328dc43 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -29,7 +29,7 @@ onboarding.tour-tor-security.button=პარამეტრ
ების გა
 
 onboarding.tour-tor-expect-differences=Experience Tips
 onboarding.tour-tor-expect-differences.title=მოსალოდნელი 
ცვლილებები.
-onboarding.tour-tor-expect-differences.description=With all the security and 
privacy features provided by Tor, your experience while browsing the internet 
may be a little different. Things may be a bit slower, and depending on your 
security level, some elements may not work or load. You may also be asked to 
prove you are a human and not a robot.
+onboarding.tour-tor-expect-differences.description=Tor-ის მიერ 
შემოთავაზებული უსაფრ
თხოებისა და პირადი 
მონაცემების დაცვის 
საშუალებებმა, შესაძლოა მცირე 
ცვლილებები გამოიწვიოს გვერ
დების მონახულებისას. ზოგიერ
თი რამ ცოტა შენელდება და 
თქვენ მიერ შერჩეული უსაფრ
თხოების დონიდან გამომდინარე, 
გვერდების ცალკეული ნაწილები 
არ იმუშავებს ან არ ჩაიტვირ
თება. ამასთან, საიტების 
ნაწილზე, შესაძლოა ხშირად 
მოგიწიოთ იმის დá
 ƒáƒ“ასტურება რომ ადამიანი ხართ 
და არა რობოტი.
 onboarding.tour-tor-expect-differences.button=იხილეთ ხ.დ.კ.
 
 onboarding.tour-tor-onion-services=Onion-მომსახურ
ებები

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits

2018-09-25 Thread translation
commit e604fbe37d997b17ddb3bee7ef880f43693ca752
Author: Translation commit bot 
Date:   Tue Sep 25 22:16:32 2018 +

Update translations for tails-onioncircuits
---
 he/onioncircuits.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot
index 08fd777d5..666cd3977 100644
--- a/he/onioncircuits.pot
+++ b/he/onioncircuits.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2018-09-25 21:39+\n"
+"PO-Revision-Date: 2018-09-25 21:48+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed

2018-09-25 Thread translation
commit 2f5cc97aa67a0d0a756673b30b2ce29fbd9e
Author: Translation commit bot 
Date:   Tue Sep 25 22:16:37 2018 +

Update translations for tails-onioncircuits_completed
---
 he/onioncircuits.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot
index 08fd777d5..666cd3977 100644
--- a/he/onioncircuits.pot
+++ b/he/onioncircuits.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2018-09-25 21:39+\n"
+"PO-Revision-Date: 2018-09-25 21:48+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2018-09-25 Thread translation
commit de694cb82d1f3e57ac639cf47eb4b58da5a54251
Author: Translation commit bot 
Date:   Tue Sep 25 22:16:23 2018 +

Update translations for tails-openpgp-applet
---
 he/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot
index 9f1369b79..c1eb163ac 100644
--- a/he/openpgp-applet.pot
+++ b/he/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-25 21:39+\n"
+"PO-Revision-Date: 2018-09-25 21:48+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2018-09-25 Thread translation
commit db886cd2b6d92d040ee053971113b3b2e50d0d2d
Author: Translation commit bot 
Date:   Tue Sep 25 22:16:27 2018 +

Update translations for tails-openpgp-applet_completed
---
 he/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot
index 9f1369b79..c1eb163ac 100644
--- a/he/openpgp-applet.pot
+++ b/he/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-25 21:39+\n"
+"PO-Revision-Date: 2018-09-25 21:48+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

2018-09-25 Thread translation
commit 968b7e971af8065f325e9560fd5bec420f34d8f6
Author: Translation commit bot 
Date:   Tue Sep 25 21:48:19 2018 +

Update translations for torbutton-browseronboardingproperties_completed
---
 he/browserOnboarding.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties
index e141ad125..58cc41043 100644
--- a/he/browserOnboarding.properties
+++ b/he/browserOnboarding.properties
@@ -9,12 +9,12 @@ onboarding.tour-tor-welcome.button=התחל עכשיו
 
 onboarding.tour-tor-privacy=פרטיות
 onboarding.tour-tor-privacy.title=בלום גששים וחטטנים.
-onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות 
ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. 
שינויים אלו מבטיחים שהפרטיות והאבטחה שלך 
מוגנים בדפדפן. לחץ ’רשת Tor‘ כדי ללמוד כיצד 
אנחנו מגינים עליך ברמת הרשת.
+onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות 
ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. 
שינויים אלו מבטיחים שהפרטיות והאבטחה שלך 
מוגנים בדפדפן. לחץ על ’רשת Tor‘ כדי ללמוד 
כיצד אנחנו מגינים עליך ברמת הרשת.
 onboarding.tour-tor-privacy.button=לך אל רשת Tor
 
 onboarding.tour-tor-network=רשת Tor
 onboarding.tour-tor-network.title=טייל ברשת מבוזרת.
-onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל 
רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. 
בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה 
מבוזרת שאתה צריך לסמוך עליה על מנת ליהנות 
מהאינטרנט באופן פרטי.
+onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל 
רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. 
בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה 
ממורכזת שאתה צריך לסמוך עליה על מנת ליהנות 
מהאינטרנט באופן פרטי.
 onboarding.tour-tor-network.button=לך אל תצוגת מעגל
 
 onboarding.tour-tor-circuit-display=תצוגת מעגל

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-09-25 Thread translation
commit cf0a7df4f9ce29c0a2713e18ed9996173c4dc72b
Author: Translation commit bot 
Date:   Tue Sep 25 21:48:14 2018 +

Update translations for torbutton-browseronboardingproperties
---
 he/browserOnboarding.properties | 4 ++--
 ka/browserOnboarding.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties
index e141ad125..58cc41043 100644
--- a/he/browserOnboarding.properties
+++ b/he/browserOnboarding.properties
@@ -9,12 +9,12 @@ onboarding.tour-tor-welcome.button=התחל עכשיו
 
 onboarding.tour-tor-privacy=פרטיות
 onboarding.tour-tor-privacy.title=בלום גששים וחטטנים.
-onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות 
ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. 
שינויים אלו מבטיחים שהפרטיות והאבטחה שלך 
מוגנים בדפדפן. לחץ ’רשת Tor‘ כדי ללמוד כיצד 
אנחנו מגינים עליך ברמת הרשת.
+onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות 
ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. 
שינויים אלו מבטיחים שהפרטיות והאבטחה שלך 
מוגנים בדפדפן. לחץ על ’רשת Tor‘ כדי ללמוד 
כיצד אנחנו מגינים עליך ברמת הרשת.
 onboarding.tour-tor-privacy.button=לך אל רשת Tor
 
 onboarding.tour-tor-network=רשת Tor
 onboarding.tour-tor-network.title=טייל ברשת מבוזרת.
-onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל 
רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. 
בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה 
מבוזרת שאתה צריך לסמוך עליה על מנת ליהנות 
מהאינטרנט באופן פרטי.
+onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל 
רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. 
בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה 
ממורכזת שאתה צריך לסמוך עליה על מנת ליהנות 
מהאינטרנט באופן פרטי.
 onboarding.tour-tor-network.button=לך אל תצוגת מעגל
 
 onboarding.tour-tor-circuit-display=תצוגת מעגל
diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 273b1cf3b..82f75fe71 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -34,7 +34,7 @@ 
onboarding.tour-tor-expect-differences.button=იხილეთ ხ.დ.კ.
 
 onboarding.tour-tor-onion-services=Onion-მომსახურ
ებები
 onboarding.tour-tor-onion-services.title=იყავით 
მეტად-დაცული.
-onboarding.tour-tor-onion-services.description=Onion services are sites that 
end with a .onion that provide extra protections to publishers and visitors, 
including added safeguards against censorship. Onion services allow anyone to 
provide content and services anonymously. Click below to visit the DuckDuckGo 
onion site.
+onboarding.tour-tor-onion-services.description=Onion-მომსახურ
ებები წარმოადგენს საიტებს .onion 
დაბოლოებით, რომელიც 
განსაკუთრებულად მაღალ უსაფრ
თხოების დონეს სთავაზობს 
მასალების განმთავსებლებსაც 
და მნახველებსაც, მათ შორის 
ცენზურისგან თავის არიდების 
დამატებით შესაძლებლობებს. 
Onion-მომსახურებები საშუალებას 
აძლევს ნებისმიერს, შიგთავსი 
და მომსახურებები მომხმარ
ებლებს მიაწოდოს ვინაობის 
გაუმჟღავნებლად. დაწკა
 პეთ ქვემოთ, DuckDuckGo-ს onion-გვერდის 
მოსანახულებლად.
 onboarding.tour-tor-onion-services.button=ეწვიეთ Onion-ს
 
 # Circuit Display onboarding.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2018-09-25 Thread translation
commit cf72a770c91918314f022b9a5c13d71591b01e3e
Author: Translation commit bot 
Date:   Tue Sep 25 21:46:27 2018 +

Update translations for tails-openpgp-applet_completed
---
 he/openpgp-applet.pot | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot
index de852446b..9f1369b79 100644
--- a/he/openpgp-applet.pot
+++ b/he/openpgp-applet.pot
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-04-12 19:13+\n"
+"PO-Revision-Date: 2018-09-25 21:39+\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: bin/openpgp-applet:160
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
@@ -95,6 +95,8 @@ msgid "User ID:"
 msgid_plural "User IDs:"
 msgstr[0] "זהות משתמש:"
 msgstr[1] "זהויות משתמש:"
+msgstr[2] "זהויות משתמש:"
+msgstr[3] "זהויות משתמש:"
 
 #: bin/openpgp-applet:465
 msgid "None (Don't sign)"
@@ -131,12 +133,16 @@ msgid "The following selected key is not fully trusted:"
 msgid_plural "The following selected keys are not fully trusted:"
 msgstr[0] "המפתח הבא שנבחר אינו אמין במלואו:"
 msgstr[1] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
+msgstr[2] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
+msgstr[3] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
 
 #: bin/openpgp-applet:610
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
 msgstr[0] "האם אתה בוטח מספיק במפתח זה כדי 
להשתמש בו בכל מקרה?"
 msgstr[1] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
+msgstr[2] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
+msgstr[3] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
 
 #: bin/openpgp-applet:623
 msgid "No keys selected"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed

2018-09-25 Thread translation
commit fec6c76905df3e33ef627b830475b2dcd6bbf939
Author: Translation commit bot 
Date:   Tue Sep 25 21:46:37 2018 +

Update translations for tails-onioncircuits_completed
---
 he/onioncircuits.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot
index 01da9f641..08fd777d5 100644
--- a/he/onioncircuits.pot
+++ b/he/onioncircuits.pot
@@ -3,21 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# fishfurbanter , 2016
-# ION, 2017
+# Fishfur A Banter , 2016
+# ION, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2017-09-29 13:09+\n"
+"PO-Revision-Date: 2018-09-25 21:39+\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits

2018-09-25 Thread translation
commit caa605159a236c08700472ab43694be5e783fcf3
Author: Translation commit bot 
Date:   Tue Sep 25 21:46:32 2018 +

Update translations for tails-onioncircuits
---
 he/onioncircuits.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot
index 01da9f641..08fd777d5 100644
--- a/he/onioncircuits.pot
+++ b/he/onioncircuits.pot
@@ -3,21 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# fishfurbanter , 2016
-# ION, 2017
+# Fishfur A Banter , 2016
+# ION, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2017-09-29 13:09+\n"
+"PO-Revision-Date: 2018-09-25 21:39+\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2018-09-25 Thread translation
commit 16933d71c80a61afb49d88a3a0914d94d88b3a67
Author: Translation commit bot 
Date:   Tue Sep 25 21:46:22 2018 +

Update translations for tails-openpgp-applet
---
 he/openpgp-applet.pot | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot
index de852446b..9f1369b79 100644
--- a/he/openpgp-applet.pot
+++ b/he/openpgp-applet.pot
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-04-12 19:13+\n"
+"PO-Revision-Date: 2018-09-25 21:39+\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: bin/openpgp-applet:160
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
@@ -95,6 +95,8 @@ msgid "User ID:"
 msgid_plural "User IDs:"
 msgstr[0] "זהות משתמש:"
 msgstr[1] "זהויות משתמש:"
+msgstr[2] "זהויות משתמש:"
+msgstr[3] "זהויות משתמש:"
 
 #: bin/openpgp-applet:465
 msgid "None (Don't sign)"
@@ -131,12 +133,16 @@ msgid "The following selected key is not fully trusted:"
 msgid_plural "The following selected keys are not fully trusted:"
 msgstr[0] "המפתח הבא שנבחר אינו אמין במלואו:"
 msgstr[1] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
+msgstr[2] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
+msgstr[3] "המפתחות הבאים שנבחרו אינם אמינים 
במלואם:"
 
 #: bin/openpgp-applet:610
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
 msgstr[0] "האם אתה בוטח מספיק במפתח זה כדי 
להשתמש בו בכל מקרה?"
 msgstr[1] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
+msgstr[2] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
+msgstr[3] "האם אתה בוטח מספיק במפתחות אלו כדי 
להשתמש בהם בכל מקרה?"
 
 #: bin/openpgp-applet:623
 msgid "No keys selected"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [stem/master] Resume fallback for 'GETINFO exit-policy/full'

2018-09-25 Thread atagar
commit aa176374e1b7be652e2fbf0aa4240f59409d76ea
Author: Damian Johnson 
Date:   Tue Sep 25 14:39:26 2018 -0700

Resume fallback for 'GETINFO exit-policy/full'

Turns out there's several situations where 'GETINFO exit-policy/full' 
provides
an error response. Most visibly, our integ tests occasionally fail due to
calling the method too soon after tor first starts up...

  https://trac.torproject.org/projects/tor/ticket/27306

I hoped this would replace our need to infer exit policies from the torrc 
but
seems that's not to be. Resuming the fallback we used prior to the GETINFO
option's addition.

In effect this reverts commit 542fa1f.
---
 docs/change_log.rst |  1 -
 stem/control.py | 40 ---
 test/unit/control/controller.py | 52 ++---
 3 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index b91f69b3..c32af5df 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -57,7 +57,6 @@ The following are only available within Stem's `git repository
   * :func:`~stem.control.COntroller.create_hidden_service` failed when 
creating services with v2 options (:trac:`27446`)
   * :func:`~stem.control.Controller.get_info` commonly raised 
:class:`stem.ProtocolError` when it should provide :class:`stem.OperationFailed`
   * :func:`~stem.control.Controller.get_microdescriptors` reads descriptors 
from the control port if available (:spec:`b5396d5`)
-  * :func:`~stem.control.Controller.get_exit_policy` now provides None if not 
configured to be a relay (:trac:`25853`, :spec:`c5453a0`)
   * Added the delivered_read, delivered_written, overhead_read, and 
overhead_written attributes to 
:class:`~stem.response.events.CircuitBandwidthEvent` (:spec:`fbb38ec`)
   * The *config* attribute of :class:`~stem.response.events.ConfChangedEvent` 
couldn't represent tor configuration options with multiple values. It has been 
replaced with new *changed* and *unset* attributes.
   * Replaced socket's :func:`~stem.socket.ControlPort.get_address`, 
:func:`~stem.socket.ControlPort.get_port`, and 
:func:`~stem.socket.ControlSocketFile.get_socket_path` with attributes
diff --git a/stem/control.py b/stem/control.py
index 5687a4b2..8982d2d1 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1281,13 +1281,10 @@ class Controller(BaseController):
parsing the user's torrc entries. This should be more reliable for
some edge cases. (:trac:`25739`)
 
-.. versionchanged:: 1.7.0
-   Returning **None** if not contigured to be a relay.
-
 :param object default: response if the query fails
 
 :returns: :class:`~stem.exit_policy.ExitPolicy` of the tor instance that
-  we're connected to, this is **None** if not configured to be a relay
+  we're connected to
 
 :raises:
   * :class:`stem.ControllerError` if unable to query the policy
@@ -1302,11 +1299,38 @@ class Controller(BaseController):
   try:
 policy = 
stem.exit_policy.ExitPolicy(*self.get_info('exit-policy/full').splitlines())
 self._set_cache({'exit_policy': policy})
-  except stem.OperationFailed as exc:
-if exc.code == '552':
-  return None  # not configured to be a relay
+  except stem.OperationFailed:
+# There's a few situations where 'GETINFO exit-policy/full' will fail,
+# most commonly...
+#
+#   * Error 551: Descriptor still rebuilding - not ready yet
+#
+# Tor hasn't yet finished making our server descriptor. This often
+# arises when tor has first started.
+#
+#   * Error 552: Not running in server mode
+#
+# We're not configured to be a relay (no ORPort), or haven't yet
+# been able to determine our externally facing IP address.
+#
+# When these arise best we can do is infer our policy from the torrc.
+# Skipping caching so we'll retry GETINFO policy resolution next time
+# we're called.
 
-raise
+rules = []
+
+if self.get_conf('ExitRelay') == '0':
+  rules.append('reject *:*')
+
+if self.get_conf('ExitPolicyRejectPrivate') == '1':
+  rules.append('reject private:*')
+
+for policy_line in self.get_conf('ExitPolicy', multiple = True):
+  rules += policy_line.split(',')
+
+rules += self.get_info('exit-policy/default').split(',')
+
+policy = stem.exit_policy.get_config_policy(rules, 
self.get_info('address', None))
 
 return policy
 
diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index ba55208a..0ae9fafd 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -199,9 +199,55 @@ class TestControl(unittest.TestCase):
 self.assertEqual(expected, self.controller.get_exit_policy())
 
   

[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed

2018-09-25 Thread translation
commit e31d401c4561339c55cbf307562d660b1da1b423
Author: Translation commit bot 
Date:   Tue Sep 25 20:17:47 2018 +

Update translations for torbutton-torbuttonproperties_completed
---
 ka/torbutton.properties | 55 +
 1 file changed, 55 insertions(+)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
new file mode 100644
index 0..1be57db4a
--- /dev/null
+++ b/ka/torbutton.properties
@@ -0,0 +1,55 @@
+torbutton.circuit_display.internet = ინტერნეტი
+torbutton.circuit_display.ip_unknown = უცნობი 
IP-მისამართი
+torbutton.circuit_display.onion_site = Onion-საიტი
+torbutton.circuit_display.this_browser = ეს ბრაუზერი
+torbutton.circuit_display.relay = გადამცემი
+torbutton.circuit_display.tor_bridge = ხიდი
+torbutton.circuit_display.unknown_country = უცნობი 
ქვეყანა
+torbutton.circuit_display.guard = მცველი
+torbutton.circuit_display.guard_note = თქვენი [Guard] 
კვანძი შესაძლოა არ შეიცვალოს.
+torbutton.circuit_display.learn_more = იხილეთ ვრცლად
+torbutton.content_sizer.margin_tooltip = Tor-ბრაუზერი 
ამატებს მინდვრებს კიდეებზე, რ
ომ თქვენი ფანჯრის სიგანე და 
სიმაღლე ნაკლებად გამორჩეული 
და შესამჩნევი იყოს, რაც 
შეუმცირებს სხვებს, ინტერ
ნეტში თქვენი დევნის 
შესაძლებლობებს.
+torbutton.panel.tooltip.disabled = დაკლიკეთ Tor-ის 
ჩასართავად
+torbutton.panel.tooltip.enabled = დაკლიკეთ Tor-ის 
გამოსართავად
+torbutton.panel.label.disabled = Tor გამორთულია
+torbutton.panel.label.enabled = Tor ჩართულია
+extensions.torbut...@torproject.org.description = Torbutton 
საშუალებას გაძლევთ ერთი 
ღილაკით გამართოთ Tor-ის პარ
ამეტრები და სწრაფად 
გაასუფთავოთ მონახულებული 
გვერდების მონაცემები.
+torbutton.popup.external.title = ჩამოიტვირთოს 
ცალკეული სახის ფაილი?
+torbutton.popup.external.app = Tor-ბრაუზერით ვერ 
ხერხდება ამ ფაილის გახსნა. 
სხვა პროგრამაა საჭირო მის 
გასახსნელად.\n\n
+torbutton.popup.external.note = ზოგიერთი სახის 
ფაილმა, შესაძლოა Tor-ის გვერდის 
ავლით დააკავშიროს სხვა პროგრ
ამა ინტერნეტთან.\n
+torbutton.popup.external.suggest = უსაფრ
თხოებისთვის, სასურველია 
ჩამოტვირთული ფაილის გახსნა, 
კავშირგარეშედ ყოფნისას ან 
Tor-ის პირდაპირ გასაშვები ვერ
სიის გამოყენება, როგორიცაა 
Tails.\n
+torbutton.popup.launch = ჩამოტვირთვა
+torbutton.popup.cancel = გაუქმება
+torbutton.popup.dontask = ავტომატურად 
ჩამოიტვირთოს ფაილები ამიერ
იდან
+torbutton.popup.no_newnym = Torbutton ვერ ახერხებს 
ახალი ვინაობის უსაფრთხოდ 
მონიჭებას. წვდომა არ აქვს 
წვდომა Tor-ის მართვის პორ
ტთან.\n\nAre you running Tor Browser Bundle?
+torbutton.security_settings.menu.title = უსაფრთხოების 
პარამეტრები
+torbutton.title.prompt_torbrowser = მნიშვნელოვანი 
ინფორმაცია Torbutton-ის შესახებ
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't 
turn it off any more.\n\nWe made this change because it isn't safe to use 
Torbutton in a browser that's also used for non-Tor browsing. There were too 
many bugs there that we couldn't fix any other way.\n\nIf you want to keep 
using Firefox normally, you should uninstall Torbutton and download Tor Browser 
Bundle. The privacy properties of Tor Browser are also superior to those of 
normal Firefox, even when Firefox is used with Torbutton.\n\nTo 

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-09-25 Thread translation
commit 28f7a07e0c577432cc486e75f14c12cd6449d6da
Author: Translation commit bot 
Date:   Tue Sep 25 20:17:43 2018 +

Update translations for torbutton-torbuttonproperties
---
 ka/torbutton.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index 5677f3d6b..1be57db4a 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -34,7 +34,7 @@ torbutton.popup.confirm_newnym = Tor-ბრაუზერი 
დახურა
 torbutton.maximize_warning = Tor-ბრაუზერის სრულ 
ეკრანზე გაშლა, საიტებს 
საშუალებას მისცემს 
დაადგინონ თქვენი ეკრანის 
ზომები, რაც შეიძლება 
გამოიყენონ თქვენს 
ამოსაცნობად. ჩვენ გირჩევთ 
დატოვოთ Tor-ბრაუზერის ფანჯარა, 
არსებულ ზომებში.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
+canvas.siteprompt=ვებსაიტი (%S) ცდილობს 
HTML5-ის გრაფიკული 
გამოსახულების მონაცემების 
მიღებას, რაც შესაძლოა 
გამოყენებული იყოს თქვენი 
კომპიუტერის 
ამოსაცნობად.\n\nმისცეს Tor-ბრ
აუზერმა უფლება ამ ვებსაიტს, 
მიიღოს HTML5-ის გრაფიკული 
გამოსახულების მონაცემები?
 canvas.notNow=ახლა არა
 canvas.notNowAccessKey=ა
 canvas.allow=დაშვება მომავალში
@@ -45,11 +45,11 @@ canvas.neverAccessKey=რ
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=%S პროფილის ხარვეზი
-profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
-profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
-profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
-profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.
+profileReadOnly=თქვენ ვერ შეძლებთ 
გაუშვათ %S მხოლოდ წაკითხვის 
შესაძლებლობის მქონე საფაილო 
სისტემიდან. გთხოვთ, 
გადააკოპიროთ %S სხვა ადგილზე, 
გამოყენებამდე.
+profileReadOnlyMac=თქვენ ვერ შეძლებთ 
გაუშვათ %S მხოლოდ წაკითხვის 
შესაძლებლობის მქონე საფაილო 
სისტემიდან. გთხოვთ, 
გადააკოპიროთ %S თქვენს მთავარ 
ეკრანის ან პროგრამების 
საქაღალდეში, მის 
გამოყენებამდე.
+profileAccessDenied=%S-ს არ გააჩნია პრ
ოფილთან წვდომის ნებართვა. 
გთხოვთ, სათანადოდ გამართოთ 
თქვენი საფაილო სისტემის 
ნებართვები და სცადოთ ხელახლა.
+profileMigrationFailed=თქვენი არსებული %S პრ
ოფილის გადატანა ვერ მოხერ
ხდა.\nგამოყენებული იქნება 
ახალი პარამეტრები.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion 
Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryptionWithBitsAndProtocol=კავშირი 
დაშიფრულია (Onion-მომსახურება, %1$S, 
%2$S ბიტიანი გასაღებები, %3$S)
 pageInfo_OnionEncryption=კავშირი დაშიფრულია 
(Onion-მომსახურება)

___

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-09-25 Thread translation
commit 48f38b8cc51ca7064acd5faa8d60897be2075315
Author: Translation commit bot 
Date:   Tue Sep 25 19:47:43 2018 +

Update translations for torbutton-torbuttonproperties
---
 ka/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index de0c3d081..5677f3d6b 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -31,16 +31,16 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can 
harm your privacy an
 torbutton.popup.never_ask_again = მომავალში 
შეკითხვის გარეშე
 torbutton.popup.confirm_newnym = Tor-ბრაუზერი დახურ
ავს ყველა ფანჯარასა და ჩანარ
თს. ყველა ვებსაიტის სეანსი 
შეწყდება.\n\nგაეშვას ხელახლა 
Tor-ბრაუზერი ახალი ვინაობის 
მისაღებად?\n\n
 
-torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
+torbutton.maximize_warning = Tor-ბრაუზერის სრულ 
ეკრანზე გაშლა, საიტებს 
საშუალებას მისცემს 
დაადგინონ თქვენი ეკრანის 
ზომები, რაც შეიძლება 
გამოიყენონ თქვენს 
ამოსაცნობად. ჩვენ გირჩევთ 
დატოვოთ Tor-ბრაუზერის ფანჯარა, 
არსებულ ზომებში.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
 canvas.notNow=ახლა არა
 canvas.notNowAccessKey=ა
-canvas.allow=ნების დართვა სამომავლოდ
+canvas.allow=დაშვება მომავალში
 canvas.allowAccessKey=დ
 canvas.never=არასდროს ამ საიტზე 
(სასურველია)
-canvas.neverAccessKey=ე
+canvas.neverAccessKey=რ
 
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add new Tor Browser version: 8.5a2

2018-09-25 Thread boklm
commit 4991263e06a7072b561b306a584f417373431c19
Author: Nicolas Vigier 
Date:   Tue Sep 25 21:18:31 2018 +0200

Add new Tor Browser version: 8.5a2
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index aa4d068b..77726431 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -26,8 +26,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.5a1
-2018-09-05
+8.5a2
+2018-09-25
 
 # If all platforms are on the same version, you only need to update
 # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 1f01129e..904c203b 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -6,5 +6,9 @@
 "8.5a1",
 "8.5a1-MacOS",
 "8.5a1-Linux",
-"8.5a1-Windows"
+"8.5a1-Windows",
+"8.5a2",
+"8.5a2-MacOS",
+"8.5a2-Linux",
+"8.5a2-Windows"
 ]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2018-09-25 Thread translation
commit b0fc1f92e750276515f9d5a592f627e74cd73367
Author: Translation commit bot 
Date:   Tue Sep 25 19:18:51 2018 +

Update translations for tor-launcher-properties_completed
---
 ka/torlauncher.properties | 78 +++
 1 file changed, 78 insertions(+)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
new file mode 100644
index 0..48a7acf1e
--- /dev/null
+++ b/ka/torlauncher.properties
@@ -0,0 +1,78 @@
+### Copyright (c) 2016, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.error_title=Tor-ის გამშვები
+
+torlauncher.tor_exited_during_startup=Tor მოულოდნელად 
დაიხურა გაშვებისას. ამის 
მიზეზი შესაძლოა იყოს შეცდომა 
torrc-ფაილში, Tor-ის ხარვეზი, 
სისტემაში არსებული სხვა პრ
ოგრამა ან დაზიანებული აპარ
ატურა. სანამ აღნიშნულ გაუმარ
თაობას არ გამოასწორებთ და Tor-ს 
ხელახლა არ გაუშვებთ, Tor-ბრაუზერ
ი არ ჩაირთვება.
+torlauncher.tor_exited=Tor მოულოდნელად დაიხურ
ა. ამის მიზეზი შესაძლოა იყოს 
თავად Tor-ის ხარვეზი, სისტემაში 
არსებული სხვა პროგრამა ან 
დაზიანებული აპარატურა. Tor-ის 
ხელახლა გაშვების გარეშე, Tor-ბრ
აუზერი ვერ შეძლებს საიტების 
გახსნას. თუ გაუმართაობა არ 
მოგვარდება, გთხოვთ, 
გადაუგზავნოთ Tor-ის აღრიცხვის 
ჩანაწერის ასლი მხარდაჭერის 
გუნდს.
+torlauncher.tor_exited2=Tor-ის ხელახლა 
გაშვებით, თქვენი ბრაუზერის 
ჩანართები არ დაიხურება.
+torlauncher.tor_controlconn_failed=Tor-ის მართვის პორ
ტთან დაკავშირება ვერ ხერ
ხდება.
+torlauncher.tor_failed_to_start=Tor-ის გაშვება ვერ 
მოხერხდა.
+torlauncher.tor_control_failed=Tor-ის მართვა ვერ 
ხერხდება.
+torlauncher.tor_bootstrap_failed=Tor ვერ ახერხებს 
Tor-ქსელთან კავშირის დამყარ
ებას.
+torlauncher.tor_bootstrap_failed_details=%1$S ვერ მოხერ
ხდა (%2$S).
+
+torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ 
ხერხდება.\n\n%S
+torlauncher.tor_missing=Tor-ის გამშვები ვერ 
მოიძებნა.
+torlauncher.torrc_missing=torrc-ფაილი ვერ 
მოინახა და ვერ შეიქმნება.
+torlauncher.datadir_missing=Tor-ის მონაცემთა 
საქაღალდე არ არსებობს და ვერ 
შეიქმნება.
+torlauncher.password_hash_missing=ჰეშირებული პარ
ოლის მიღება ვერ მოხერხდა.
+
+torlauncher.failed_to_get_settings=Tor-ის პარამეტრ
ების მიღება ვერ ხერხდება.\n\n%S
+torlauncher.failed_to_save_settings=Tor-ის პარამეტრ
ების შენახვა ვერ ხერხდება.\n\n%S
+torlauncher.ensure_tor_is_running=გთხოვთ დარ
წმუნდეთ, რომ Tor გაშვებულია.
+
+torlauncher.error_proxy_addr_missing=თქვენ უნდა 
მიუთითოთ ორივე, IP-მისამართი ან 
დასახელება და პორტის ნომერი, რ
ომ Tor დაუკავშირდეს ინტერნეტს 
პროქსის საშუალებით.
+torlauncher.error_proxy_type_missing=უნდა მიუთითოთ 
პროქსის სახეობა.
+torlauncher.error_bridges_missing=უნდა მიუთითოთ ერ
თი ან რამდენიმე გადამცემი 
ხიდი.
+torlauncher.error_default_bridges_type_missing=უნდა 
მიუთითოთ გადამყვანის 
სახეობა, მოცემული გადამცემი 
ხიდებისთვის.

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 7e41819d749fd6ce5abc78bf2c5e69504c4c0976
Author: Translation commit bot 
Date:   Tue Sep 25 19:18:46 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index ff29f972d..48a7acf1e 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -3,10 +3,10 @@
 
 torlauncher.error_title=Tor-ის გამშვები
 
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be 
due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Tor-ის ხელახლა ჩართვით 
თქვენი ბრაუზერის ჩანართები 
არ დაიხურება.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
+torlauncher.tor_exited_during_startup=Tor მოულოდნელად 
დაიხურა გაშვებისას. ამის 
მიზეზი შესაძლოა იყოს შეცდომა 
torrc-ფაილში, Tor-ის ხარვეზი, 
სისტემაში არსებული სხვა პრ
ოგრამა ან დაზიანებული აპარ
ატურა. სანამ აღნიშნულ გაუმარ
თაობას არ გამოასწორებთ და Tor-ს 
ხელახლა არ გაუშვებთ, Tor-ბრაუზერ
ი არ ჩაირთვება.
+torlauncher.tor_exited=Tor მოულოდნელად დაიხურ
ა. ამის მიზეზი შესაძლოა იყოს 
თავად Tor-ის ხარვეზი, სისტემაში 
არსებული სხვა პროგრამა ან 
დაზიანებული აპარატურა. Tor-ის 
ხელახლა გაშვების გარეშე, Tor-ბრ
აუზერი ვერ შეძლებს საიტების 
გახსნას. თუ გაუმართაობა არ 
მოგვარდება, გთხოვთ, 
გადაუგზავნოთ Tor-ის აღრიცხვის 
ჩანაწერის ასლი მხარდაჭერის 
გუნდს.
+torlauncher.tor_exited2=Tor-ის ხელახლა 
გაშვებით, თქვენი ბრაუზერის 
ჩანართები არ დაიხურება.
+torlauncher.tor_controlconn_failed=Tor-ის მართვის პორ
ტთან დაკავშირება ვერ ხერ
ხდება.
 torlauncher.tor_failed_to_start=Tor-ის გაშვება ვერ 
მოხერხდა.
 torlauncher.tor_control_failed=Tor-ის მართვა ვერ 
ხერხდება.
 torlauncher.tor_bootstrap_failed=Tor ვერ ახერხებს 
Tor-ქსელთან კავშირის დამყარ
ებას.
@@ -35,8 +35,8 @@ torlauncher.bridge_suffix.meek-azure=(მუშაობს 
ჩინეთშ
 torlauncher.request_a_bridge=გადამცემი ხიდის 
მოთხოვნა...
 torlauncher.request_a_new_bridge=ახალი გადამცემი 
ხიდის მოთხოვნა...
 torlauncher.contacting_bridgedb=დაკავშირება 
BridgeDB-სთან. გთხოვთ, მოითმინოთ.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+torlauncher.captcha_prompt=გაიარეთ CAPTCHA, 
გადამცემი ხიდის 
მოთხოვნისთვის.
+torlauncher.bad_captcha_solution=გადაწყვეტა არ
ასწორია. გთხოვთ სცადოთ 
ხელახლა.
 torlauncher.unable_to_get_bridge=გადამცემი 
ხიდების მიღება BridgeDB-იდან ვერ 
ხერხდება.\n\n%S
 torlauncher.no_meek=ბრაუზერი არაა გამარ
თული meek-ისთვის, რომელიც საჭირ
ოა გადამცემი ხიდების 
მისაღებად.
 

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-09-25 Thread translation
commit 66f059969dc5de48a0f325f8bf90b9c5506a3997
Author: Translation commit bot 
Date:   Tue Sep 25 19:18:00 2018 +

Update translations for torbutton-torbuttonproperties
---
 ka/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index b1814ec13..de0c3d081 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -29,7 +29,7 @@ torbutton.popup.short_torbrowser = Important Torbutton 
Information!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy 
and anonymity.\n\nThey can also bypass Tor to reveal your current location and 
IP address.\n\nAre you sure you want to enable plugins?\n\n
 torbutton.popup.never_ask_again = მომავალში 
შეკითხვის გარეშე
-torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. 
All website sessions will be lost.\n\nRestart Tor Browser now to reset your 
identity?\n\n
+torbutton.popup.confirm_newnym = Tor-ბრაუზერი დახურ
ავს ყველა ფანჯარასა და ჩანარ
თს. ყველა ვებსაიტის სეანსი 
შეწყდება.\n\nგაეშვას ხელახლა 
Tor-ბრაუზერი ახალი ვინაობის 
მისაღებად?\n\n
 
 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
 
@@ -44,7 +44,7 @@ canvas.neverAccessKey=ე
 
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=%S პროფილის პრობლემა
+profileProblemTitle=%S პროფილის ხარვეზი
 profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
 profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
@@ -52,4 +52,4 @@ profileMigrationFailed=Migration of your existing %S profile 
failed.\nNew settin
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion 
Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryption=კავშირი დაშიფრულია 
(Onion-მომსახურება)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-09-25 Thread translation
commit 3df8c1bf57cf1a02fe2099b7ba5e7f03ba9878fa
Author: Translation commit bot 
Date:   Tue Sep 25 19:17:36 2018 +

Update translations for tor-browser-manual
---
 ka/ka.po | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ka/ka.po b/ka/ka.po
index c19df5763..562fc7406 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -1,13 +1,12 @@
 # Translators:
-# Tor Project , 2016
+# A. C. , 2016
 # George Salukvadze , 2016
-# A. C. , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2018-09-07 16:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: A. C. , 2018\n"
+"Last-Translator: George Salukvadze , 2016\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -715,7 +714,7 @@ msgstr ""
 
 #: managing-identities.page:111
 msgid "New Identity"
-msgstr "New Identity"
+msgstr "ახალი ვინაობა"
 
 #: managing-identities.page:112
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 07f89454689de36da5ddedc051371ce89677e42d
Author: Translation commit bot 
Date:   Tue Sep 25 18:48:31 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index 595e980fb..ff29f972d 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -37,13 +37,13 @@ torlauncher.request_a_new_bridge=ახალი 
გადამცემი ხ
 torlauncher.contacting_bridgedb=დაკავშირება 
BridgeDB-სთან. გთხოვთ, მოითმინოთ.
 torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
 torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed 
to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.unable_to_get_bridge=გადამცემი 
ხიდების მიღება BridgeDB-იდან ვერ 
ხერხდება.\n\n%S
+torlauncher.no_meek=ბრაუზერი არაა გამარ
თული meek-ისთვის, რომელიც საჭირ
ოა გადამცემი ხიდების 
მისაღებად.
+torlauncher.no_bridges_available=ამჟამად 
გადამცემი ხიდები არაა 
ხელმისაწვდომი. ვწუხვართ.
 
 torlauncher.connect=დაკავშირება
 torlauncher.restart_tor=Tor-ის ხელახლა გაშვება
-torlauncher.quit=Quit
+torlauncher.quit=დახურვა
 torlauncher.quit_win=გასვლა
 torlauncher.done=შესრულებულია
 
@@ -65,14 +65,14 @@ torlauncher.bootstrapStatus.done=Tor-ქსელთან 
დაკავში
 
 torlauncher.bootstrapWarning.done=მზადაა
 torlauncher.bootstrapWarning.connectrefused=კავშირი უარ
ყოფილია
-torlauncher.bootstrapWarning.misc=miscellaneous
-torlauncher.bootstrapWarning.resourcelimit=insufficient resources
-torlauncher.bootstrapWarning.identity=identity mismatch
-torlauncher.bootstrapWarning.timeout=connection timeout
+torlauncher.bootstrapWarning.misc=სხვადასხვა
+torlauncher.bootstrapWarning.resourcelimit=არასაკმარ
ისი რესურსები
+torlauncher.bootstrapWarning.identity=მოწმობა არ 
ემთხვევა
+torlauncher.bootstrapWarning.timeout=კავშირის ვადა
 torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერ
ის შეცდომა
+torlauncher.bootstrapWarning.pt_missing=მისაერთებელი 
გადამყვანი ვერ მოიძებნა
 
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the 
server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to 
the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=სერვერთან 
კავშირი დაიკარგა.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=სერვერთან 
დაკავშირება ვერ ხერხდება.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=პრ
ოქსისთან დაკავშირება ვერ ხერ
ხდება.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation] Update translations for tor_animation

2018-09-25 Thread translation
commit dd8cb7d799ad9fd484acd3f165b8c7266aa1a9bb
Author: Translation commit bot 
Date:   Tue Sep 25 18:47:03 2018 +

Update translations for tor_animation
---
 vi.srt | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vi.srt b/vi.srt
index 55e040540..39078455f 100644
--- a/vi.srt
+++ b/vi.srt
@@ -39,16 +39,16 @@ về bạn và cuộc sống của bạn
 
 10
 00:00:29,200 --> 00:00:31,500
-những gì mà có thể bạn không dự định
+Đó là những thông tin bạn không dự định
 chia sẻ với những người lạ,
 
 11
 00:00:31,700 --> 00:00:34,000
-những người mà có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
+những người đó có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
 
 12
 00:00:34,500 --> 00:00:37,000
-Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor!
+Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor !
 
 13
 00:00:37,140 --> 00:00:40,840
@@ -152,5 +152,5 @@ như những nhà hoạt động, những nhà báo và 
những blogger.
 
 35
 00:02:02,000 --> 00:02:07,000
-Download và sử dụng Tor! Hoặc chạy một chương trình giúp 
những người tham gia Tor ẩn danh!
+Bạn có thể tải và sử dụng Tor. Hoặc chạy một chương trình 
chuyển tiếp để hỗ trợ cộng đồng Tor.
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2018-09-25 Thread translation
commit 330dafb05392ed78acbbc2b3a590a8c722847fea
Author: Translation commit bot 
Date:   Tue Sep 25 18:47:07 2018 +

Update translations for tor_animation_completed
---
 vi.srt | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vi.srt b/vi.srt
index 55e040540..39078455f 100644
--- a/vi.srt
+++ b/vi.srt
@@ -39,16 +39,16 @@ về bạn và cuộc sống của bạn
 
 10
 00:00:29,200 --> 00:00:31,500
-những gì mà có thể bạn không dự định
+Đó là những thông tin bạn không dự định
 chia sẻ với những người lạ,
 
 11
 00:00:31,700 --> 00:00:34,000
-những người mà có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
+những người đó có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
 
 12
 00:00:34,500 --> 00:00:37,000
-Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor!
+Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor !
 
 13
 00:00:37,140 --> 00:00:40,840
@@ -152,5 +152,5 @@ như những nhà hoạt động, những nhà báo và 
những blogger.
 
 35
 00:02:02,000 --> 00:02:07,000
-Download và sử dụng Tor! Hoặc chạy một chương trình giúp 
những người tham gia Tor ẩn danh!
+Bạn có thể tải và sử dụng Tor. Hoặc chạy một chương trình 
chuyển tiếp để hỗ trợ cộng đồng Tor.
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-09-25 Thread translation
commit f5b8582c22ba9d19b8925195ee6ee08a02660703
Author: Translation commit bot 
Date:   Tue Sep 25 18:46:47 2018 +

Update translations for tba-android_stringsdtd
---
 ka/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/android_strings.dtd b/ka/android_strings.dtd
index 304d68831..3a440a5f1 100644
--- a/ka/android_strings.dtd
+++ b/ka/android_strings.dtd
@@ -441,7 +441,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove 8.0 from RecommendedTBBVersions

2018-09-25 Thread boklm
commit a4693fd514c5dbc878f3e98772cf95e9e014
Author: Nicolas Vigier 
Date:   Tue Sep 25 20:41:20 2018 +0200

Remove 8.0 from RecommendedTBBVersions
---
 projects/torbrowser/RecommendedTBBVersions | 4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index cdac1089..1f01129e 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -1,8 +1,4 @@
 [
-"8.0",
-"8.0-MacOS",
-"8.0-Linux",
-"8.0-Windows",
 "8.0.1",
 "8.0.1-MacOS",
 "8.0.1-Linux",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 490146b97e7b2ff1323968659de644d1d635afe4
Author: Translation commit bot 
Date:   Tue Sep 25 18:18:24 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index 111b56ae0..595e980fb 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -47,13 +47,13 @@ torlauncher.quit=Quit
 torlauncher.quit_win=გასვლა
 torlauncher.done=შესრულებულია
 
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
+torlauncher.forAssistance=დახმარებისთვის 
დაუკავშირდით %S
+torlauncher.forAssistance2=დახმარებისთვის 
ეწვიეთ %S
 
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to 
be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=დაკოპირება დასრ
ულებულია. %S Tor-ის აღრიცხვის 
ჩანაწერები მზადაა ტექსტურ რ
ედაქტორში ან ელფოსტის წერ
ილში ჩასასმელად.
 
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory 
connection
+torlauncher.bootstrapStatus.conn_dir=გადამცემთა 
ცნობართან დაკავშირება
+torlauncher.bootstrapStatus.handshake_dir=დაშიფრული 
კავშირის დამყარება ცნობართან
 torlauncher.bootstrapStatus.requesting_status=ქსელის 
მდგომარეობის დადგენა
 torlauncher.bootstrapStatus.loading_status=ქსელის 
მდგომარეობის ჩატვირთვა
 torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი 
სერტიფიკატების ჩატვირთვა
@@ -61,10 +61,10 @@ 
torlauncher.bootstrapStatus.requesting_descriptors=გადამცემი
 torlauncher.bootstrapStatus.loading_descriptors=გადამცემის 
მონაცემების ჩატვირთვა
 torlauncher.bootstrapStatus.conn_or=უკავშირდება 
Tor-ქსელს
 torlauncher.bootstrapStatus.handshake_or=Tor-ის კავშირის 
წრედის დამყარება
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+torlauncher.bootstrapStatus.done=Tor-ქსელთან 
დაკავშირებულია!
 
-torlauncher.bootstrapWarning.done=done
-torlauncher.bootstrapWarning.connectrefused=connection refused
+torlauncher.bootstrapWarning.done=მზადაა
+torlauncher.bootstrapWarning.connectrefused=კავშირი უარ
ყოფილია
 torlauncher.bootstrapWarning.misc=miscellaneous
 torlauncher.bootstrapWarning.resourcelimit=insufficient resources
 torlauncher.bootstrapWarning.identity=identity mismatch

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 7ad7677fd347362c942ea64961d20eacac9d3b68
Author: Translation commit bot 
Date:   Tue Sep 25 17:48:25 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index ba6ebc648..111b56ae0 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -54,9 +54,9 @@ torlauncher.copiedNLogMessages=Copy complete. %S Tor log 
messages are ready to b
 
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory 
connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
-torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
+torlauncher.bootstrapStatus.requesting_status=ქსელის 
მდგომარეობის დადგენა
+torlauncher.bootstrapStatus.loading_status=ქსელის 
მდგომარეობის ჩატვირთვა
+torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი 
სერტიფიკატების ჩატვირთვა
 
torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის
 მონაცემების მოთხოვნა
 torlauncher.bootstrapStatus.loading_descriptors=გადამცემის 
მონაცემების ჩატვირთვა
 torlauncher.bootstrapStatus.conn_or=უკავშირდება 
Tor-ქსელს

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 4de9286f3b796a8b500196b274e7ae557ef35b2b
Author: Translation commit bot 
Date:   Tue Sep 25 16:18:24 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index d76609e76..ba6ebc648 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -14,7 +14,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S ვერ 
მოხერხდა
 
 torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ 
ხერხდება.\n\n%S
 torlauncher.tor_missing=Tor-ის გამშვები ვერ 
მოიძებნა.
-torlauncher.torrc_missing=torrc-ფაილი ვერ 
მოინახა და მისი შექმნა ვერ ხერ
ხდება.
+torlauncher.torrc_missing=torrc-ფაილი ვერ 
მოინახა და ვერ შეიქმნება.
 torlauncher.datadir_missing=Tor-ის მონაცემთა 
საქაღალდე არ არსებობს და ვერ 
შეიქმნება.
 torlauncher.password_hash_missing=ჰეშირებული პარ
ოლის მიღება ვერ მოხერხდა.
 
@@ -57,8 +57,8 @@ torlauncher.bootstrapStatus.handshake_dir=Establishing an 
encrypted directory co
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
 torlauncher.bootstrapStatus.loading_status=Loading network status
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
+torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის
 მონაცემების მოთხოვნა
+torlauncher.bootstrapStatus.loading_descriptors=გადამცემის 
მონაცემების ჩატვირთვა
 torlauncher.bootstrapStatus.conn_or=უკავშირდება 
Tor-ქსელს
 torlauncher.bootstrapStatus.handshake_or=Tor-ის კავშირის 
წრედის დამყარება
 torlauncher.bootstrapStatus.done=Connected to the Tor network!

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit fb02d7c7d8128fbf288381368dc75cd34ad6517f
Author: Translation commit bot 
Date:   Tue Sep 25 15:48:26 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index bf2b9a6f7..d76609e76 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -27,14 +27,14 @@ torlauncher.error_proxy_type_missing=უნდა 
მიუთითოთ პ
 torlauncher.error_bridges_missing=უნდა მიუთითოთ ერ
თი ან რამდენიმე გადამცემი 
ხიდი.
 torlauncher.error_default_bridges_type_missing=უნდა 
მიუთითოთ გადამყვანის 
სახეობა, მოცემული გადამცემი 
ხიდებისთვის.
 torlauncher.error_bridgedb_bridges_missing=გთხოვთ, 
მოითხოვოთ გადამცემი ხიდი.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
+torlauncher.error_bridge_bad_default_type=არცერთი 
მოცემული გადამცემ ხიდისთვის, 
%S სახის გადამყვანი არაა 
ხელმისაწვდომი. გთხოვთ გამარ
თოთ თქვენი პარამეტრები.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(მუშაობს 
ჩინეთში)
+torlauncher.bridge_suffix.meek-azure=(მუშაობს 
ჩინეთში)
 
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
+torlauncher.request_a_bridge=გადამცემი ხიდის 
მოთხოვნა...
+torlauncher.request_a_new_bridge=ახალი გადამცემი 
ხიდის მოთხოვნა...
+torlauncher.contacting_bridgedb=დაკავშირება 
BridgeDB-სთან. გთხოვთ, მოითმინოთ.
 torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
 torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
 torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-09-25 Thread translation
commit 72abfc52da7193de8cfe6e60e3e0b3205db134c4
Author: Translation commit bot 
Date:   Tue Sep 25 15:19:59 2018 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index f160ca1d8..bf2b9a6f7 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -14,7 +14,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S ვერ 
მოხერხდა
 
 torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ 
ხერხდება.\n\n%S
 torlauncher.tor_missing=Tor-ის გამშვები ვერ 
მოიძებნა.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.torrc_missing=torrc-ფაილი ვერ 
მოინახა და მისი შექმნა ვერ ხერ
ხდება.
 torlauncher.datadir_missing=Tor-ის მონაცემთა 
საქაღალდე არ არსებობს და ვერ 
შეიქმნება.
 torlauncher.password_hash_missing=ჰეშირებული პარ
ოლის მიღება ვერ მოხერხდა.
 
@@ -22,11 +22,11 @@ torlauncher.failed_to_get_settings=Tor-ის პარ
ამეტრები
 torlauncher.failed_to_save_settings=Tor-ის პარამეტრ
ების შენახვა ვერ ხერხდება.\n\n%S
 torlauncher.ensure_tor_is_running=გთხოვთ დარ
წმუნდეთ, რომ Tor გაშვებულია.
 
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or 
hostname and a port number to configure Tor to use a proxy to access the 
Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_proxy_addr_missing=თქვენ უნდა 
მიუთითოთ ორივე, IP-მისამართი ან 
დასახელება და პორტის ნომერი, რ
ომ Tor დაუკავშირდეს ინტერნეტს 
პროქსის საშუალებით.
+torlauncher.error_proxy_type_missing=უნდა მიუთითოთ 
პროქსის სახეობა.
+torlauncher.error_bridges_missing=უნდა მიუთითოთ ერ
თი ან რამდენიმე გადამცემი 
ხიდი.
+torlauncher.error_default_bridges_type_missing=უნდა 
მიუთითოთ გადამყვანის 
სახეობა, მოცემული გადამცემი 
ხიდებისთვის.
+torlauncher.error_bridgedb_bridges_missing=გთხოვთ, 
მოითხოვოთ გადამცემი ხიდი.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
 
 torlauncher.bridge_suffix.meek-amazon=(works in China)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2018-09-25 Thread translation
commit 629d186d5a7ec73d337b1462471d79f5825200b0
Author: Translation commit bot 
Date:   Tue Sep 25 14:48:22 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 fr/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/abouttbupdate.dtd b/fr/abouttbupdate.dtd
index 7ff3ca310..cfed15d9a 100644
--- a/fr/abouttbupdate.dtd
+++ b/fr/abouttbupdate.dtd
@@ -6,5 +6,5 @@
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2018-09-25 Thread translation
commit 019a82020916dd5032211f934ab706640a2fc2e3
Author: Translation commit bot 
Date:   Tue Sep 25 14:48:17 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 fr/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/abouttbupdate.dtd b/fr/abouttbupdate.dtd
index 7ff3ca310..cfed15d9a 100644
--- a/fr/abouttbupdate.dtd
+++ b/fr/abouttbupdate.dtd
@@ -6,5 +6,5 @@
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2018-09-25 Thread translation
commit 4a07f1f71208fa323c15c7d38835ae0070d96012
Author: Translation commit bot 
Date:   Tue Sep 25 14:47:15 2018 +

Update translations for tor_animation_completed
---
 vi.srt | 44 ++--
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/vi.srt b/vi.srt
index 96720135c..55e040540 100644
--- a/vi.srt
+++ b/vi.srt
@@ -13,11 +13,11 @@ về bản thân và về cuộc sống riêng tư của 
chúng ta
 
 4
 00:00:10,180 --> 00:00:12,480
-những nơi chúng ta đến, và những chuyện chúng ta xem
+những nơi chúng ta đến, và những thứ chúng ta xem
 
 5
 00:00:13,280 --> 00:00:14,640
-Để tôi giải thích nó rõ hơn.
+Để tôi giải thích rõ hơn.
 
 6
 00:00:14,920 --> 00:00:17,740
@@ -26,8 +26,7 @@ nếu có ai đó cố gắng tìm kiếm bạn,
 
 7
 00:00:18,060 --> 00:00:22,480
-Họ sẽ thấy thông tin danh tính thực sự của bạn
-vị trí chính xác, hệ điều hành,
+Họ sẽ thấy thông tin danh tính thực sự của bạn, vị trí 
chính xác bạn đang truy cập Internet, hệ điều hành bạn đang 
sử dụng,
 
 8
 00:00:22,800 --> 00:00:26,500
@@ -45,17 +44,15 @@ chia sẻ với những người lạ,
 
 11
 00:00:31,700 --> 00:00:34,000
-những người mà có thể sử dụng những dữ liệu này
-để lợi dụng bạn.
+những người mà có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
 
 12
 00:00:34,500 --> 00:00:37,000
-Nhưng sẽ không như vậy nếu bạn đang dùng Tor!
+Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
-Trình duyệt Tor bảo vệ sự riêng tư của chúng ta
-và danh tính trên Internet
+Trình duyệt Tor bảo vệ sự riêng tư và danh tính của chúng ta 
trên Internet
 
 14
 00:00:41,560 --> 00:00:44,760
@@ -69,7 +66,7 @@ một cách tự nguyện trên toàn thế giới,
 
 16
 00:00:50,280 --> 00:00:53,520
-những thứ giúp chúng ta giao tiếp
+điều này giúp chúng ta giao tiếp
 một cách vô danh trên Internet.
 
 17
@@ -78,18 +75,16 @@ Tor còn bảo vệ dữ liệu của chúng ta
 
 18
 00:00:58,400 --> 00:01:01,900
-khỏi sự giám sát có mục tiêu hoặc hàng loạt của
-các công ty và chính phủ.
+khỏi sự giám sát có mục tiêu và trên diện rộng của các 
công ty hoặc chính phủ.
 
 19
 00:01:02,880 --> 00:01:07,340
-Có lẽ bạn sống ở một quốc gia bị đàn áp
-nước mà cố kiểm soát và giám sát Internet.
+Có lẽ bạn sống ở một quốc gia đàn áp đang
+cố kiểm soát và giám sát Internet.
 
 20
 00:01:07,900 --> 00:01:11,800
-Hoặc có lẽ bạn không muốn những công ty lớn
-kiếm lợi nhuận từ thông tin cá nhân của bạn.
+Hoặc có lẽ bạn không muốn những công ty lớn kiếm lợi 
nhuận từ thông tin cá nhân của bạn.
 
 21
 00:01:12,880 --> 00:01:15,640
@@ -98,7 +93,7 @@ nhìn giống nhau
 
 22
 00:01:15,920 --> 00:01:18,800
-thứ làm cho người giám sát bối rối
+sự giống nhau làm cho người giám sát bối rối
 và làm bạn vô danh
 
 23
@@ -108,13 +103,12 @@ mạng lưới này càng mạnh hơn
 
 24
 00:01:23,140 --> 00:01:27,800
-vì sẽ dễ dàng hơn khi ẩn mình trong một đám đông
-những người nhìn giống hệt nhau.
+vì sẽ dễ dàng hơn khi ẩn mình trong một đám đông mà mọi 
người nhìn giống hệt nhau.
 
 25
 00:01:28,700 --> 00:01:31,240
 Bạn có thể vượt qua sự kiểm duyệt
-mà không cần lo lắng về nó
+mà không cần lo lắng về việc
 
 26
 00:01:31,400 --> 00:01:34,100
@@ -133,13 +127,11 @@ bấm chuột vào một sản phẩm
 
 29
 00:01:43,880 --> 00:01:47,380
-Bằng cách dùng Tor, những trang bạn ghé thăm
-sẽ thậm chí không biết bạn là ai,
+Bằng cách dùng Tor, những trang bạn ghé thăm sẽ thậm chí không 
biết bạn là ai,
 
 30
 00:01:47,540 --> 00:01:49,760
-từ nơi nào trên thế giới
-mà bạn đang ghé thăm,
+bạn từ đâu tới,
 
 31
 00:01:49,920 --> 00:01:51,920
@@ -147,7 +139,7 @@ trừ khi bạn đăng nhập và nói cho họ biết.
 
 32
 00:01:54,200 --> 00:01:55,840
-Bằng cách tải về Tor,
+Bằng cách tải và cài đặt Tor,
 
 33
 00:01:56,200 --> 00:01:58,560
@@ -160,5 +152,5 @@ như những nhà hoạt động, những nhà báo và 
những blogger.
 
 35
 00:02:02,000 --> 00:02:07,000
-Download và sử dụng Tor! Hoặc chạy một trình tiếp sức!
+Download và sử dụng Tor! Hoặc chạy một chương trình giúp 
những người tham gia Tor ẩn danh!
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation] Update translations for tor_animation

2018-09-25 Thread translation
commit 30d1bb3cf2a01b1b643441ba4aca5efa1a37c9aa
Author: Translation commit bot 
Date:   Tue Sep 25 14:47:09 2018 +

Update translations for tor_animation
---
 vi.srt | 44 ++--
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/vi.srt b/vi.srt
index 96720135c..55e040540 100644
--- a/vi.srt
+++ b/vi.srt
@@ -13,11 +13,11 @@ về bản thân và về cuộc sống riêng tư của 
chúng ta
 
 4
 00:00:10,180 --> 00:00:12,480
-những nơi chúng ta đến, và những chuyện chúng ta xem
+những nơi chúng ta đến, và những thứ chúng ta xem
 
 5
 00:00:13,280 --> 00:00:14,640
-Để tôi giải thích nó rõ hơn.
+Để tôi giải thích rõ hơn.
 
 6
 00:00:14,920 --> 00:00:17,740
@@ -26,8 +26,7 @@ nếu có ai đó cố gắng tìm kiếm bạn,
 
 7
 00:00:18,060 --> 00:00:22,480
-Họ sẽ thấy thông tin danh tính thực sự của bạn
-vị trí chính xác, hệ điều hành,
+Họ sẽ thấy thông tin danh tính thực sự của bạn, vị trí 
chính xác bạn đang truy cập Internet, hệ điều hành bạn đang 
sử dụng,
 
 8
 00:00:22,800 --> 00:00:26,500
@@ -45,17 +44,15 @@ chia sẻ với những người lạ,
 
 11
 00:00:31,700 --> 00:00:34,000
-những người mà có thể sử dụng những dữ liệu này
-để lợi dụng bạn.
+những người mà có thể sử dụng những dữ liệu này để 
lợi dụng bạn.
 
 12
 00:00:34,500 --> 00:00:37,000
-Nhưng sẽ không như vậy nếu bạn đang dùng Tor!
+Nhưng điều đó sẽ không xảy ra nếu bạn đang dùng Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
-Trình duyệt Tor bảo vệ sự riêng tư của chúng ta
-và danh tính trên Internet
+Trình duyệt Tor bảo vệ sự riêng tư và danh tính của chúng ta 
trên Internet
 
 14
 00:00:41,560 --> 00:00:44,760
@@ -69,7 +66,7 @@ một cách tự nguyện trên toàn thế giới,
 
 16
 00:00:50,280 --> 00:00:53,520
-những thứ giúp chúng ta giao tiếp
+điều này giúp chúng ta giao tiếp
 một cách vô danh trên Internet.
 
 17
@@ -78,18 +75,16 @@ Tor còn bảo vệ dữ liệu của chúng ta
 
 18
 00:00:58,400 --> 00:01:01,900
-khỏi sự giám sát có mục tiêu hoặc hàng loạt của
-các công ty và chính phủ.
+khỏi sự giám sát có mục tiêu và trên diện rộng của các 
công ty hoặc chính phủ.
 
 19
 00:01:02,880 --> 00:01:07,340
-Có lẽ bạn sống ở một quốc gia bị đàn áp
-nước mà cố kiểm soát và giám sát Internet.
+Có lẽ bạn sống ở một quốc gia đàn áp đang
+cố kiểm soát và giám sát Internet.
 
 20
 00:01:07,900 --> 00:01:11,800
-Hoặc có lẽ bạn không muốn những công ty lớn
-kiếm lợi nhuận từ thông tin cá nhân của bạn.
+Hoặc có lẽ bạn không muốn những công ty lớn kiếm lợi 
nhuận từ thông tin cá nhân của bạn.
 
 21
 00:01:12,880 --> 00:01:15,640
@@ -98,7 +93,7 @@ nhìn giống nhau
 
 22
 00:01:15,920 --> 00:01:18,800
-thứ làm cho người giám sát bối rối
+sự giống nhau làm cho người giám sát bối rối
 và làm bạn vô danh
 
 23
@@ -108,13 +103,12 @@ mạng lưới này càng mạnh hơn
 
 24
 00:01:23,140 --> 00:01:27,800
-vì sẽ dễ dàng hơn khi ẩn mình trong một đám đông
-những người nhìn giống hệt nhau.
+vì sẽ dễ dàng hơn khi ẩn mình trong một đám đông mà mọi 
người nhìn giống hệt nhau.
 
 25
 00:01:28,700 --> 00:01:31,240
 Bạn có thể vượt qua sự kiểm duyệt
-mà không cần lo lắng về nó
+mà không cần lo lắng về việc
 
 26
 00:01:31,400 --> 00:01:34,100
@@ -133,13 +127,11 @@ bấm chuột vào một sản phẩm
 
 29
 00:01:43,880 --> 00:01:47,380
-Bằng cách dùng Tor, những trang bạn ghé thăm
-sẽ thậm chí không biết bạn là ai,
+Bằng cách dùng Tor, những trang bạn ghé thăm sẽ thậm chí không 
biết bạn là ai,
 
 30
 00:01:47,540 --> 00:01:49,760
-từ nơi nào trên thế giới
-mà bạn đang ghé thăm,
+bạn từ đâu tới,
 
 31
 00:01:49,920 --> 00:01:51,920
@@ -147,7 +139,7 @@ trừ khi bạn đăng nhập và nói cho họ biết.
 
 32
 00:01:54,200 --> 00:01:55,840
-Bằng cách tải về Tor,
+Bằng cách tải và cài đặt Tor,
 
 33
 00:01:56,200 --> 00:01:58,560
@@ -160,5 +152,5 @@ như những nhà hoạt động, những nhà báo và 
những blogger.
 
 35
 00:02:02,000 --> 00:02:07,000
-Download và sử dụng Tor! Hoặc chạy một trình tiếp sức!
+Download và sử dụng Tor! Hoặc chạy một chương trình giúp 
những người tham gia Tor ẩn danh!
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix reference to socks-extensions.txt in tor-resolve manpage

2018-09-25 Thread nickm
commit c82163dff468443d28b6d0c9b1253f7721eb3fdc
Author: rl1987 
Date:   Tue Sep 25 12:39:27 2018 +0300

Fix reference to socks-extensions.txt in tor-resolve manpage
---
 changes/doc27853  | 4 
 doc/tor-resolve.1.txt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/doc27853 b/changes/doc27853
new file mode 100644
index 0..065a54b89
--- /dev/null
+++ b/changes/doc27853
@@ -0,0 +1,4 @@
+  o Documentation:
+- In tor-resolve(1) manpage fix reference to
+  socks-extensions.txt by adding web URL. Resolves
+  ticket 27853.
diff --git a/doc/tor-resolve.1.txt b/doc/tor-resolve.1.txt
index 30e16d5da..f1f8f77a4 100644
--- a/doc/tor-resolve.1.txt
+++ b/doc/tor-resolve.1.txt
@@ -47,7 +47,7 @@ SEE ALSO
 
 **tor**(1), **torify**(1). +
 
-See doc/socks-extensions.txt in the Tor package for protocol details.
+For protocol details, see: https://spec.torproject.org/socks-extensions
 
 AUTHORS
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove notes, add seealso

2018-09-25 Thread juga
commit f27669f2c649371d61735c2702430298ad81de55
Author: juga0 
Date:   Tue Sep 18 15:08:42 2018 +

Remove notes, add seealso
---
 docs/source/faq.rst | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index 4a3887a..07e820a 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -1,10 +1,7 @@
 Frequently Asked Questions (FAQ)
 ==
 
-.. note:: even thought this questions should be answered by reading the
-   :doc:`specification`, here the answers should be short and clear.
-
-.. note:: You may also enjoy the :doc:`glossary`.
+.. seealso:: :doc:`glossary`.
 
 How many hops are the circuits used to perform the measurements?
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add dev dependency to check unused code

2018-09-25 Thread juga
commit f81b0e022bce22fd11e668991f8cc9840a72
Author: juga0 
Date:   Tue Sep 18 15:19:14 2018 +

Add dev dependency to check unused code

remove included script that does that
---
 scripts/maint/find-dead-funcs | 81 ---
 setup.py  |  3 +-
 2 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/scripts/maint/find-dead-funcs b/scripts/maint/find-dead-funcs
deleted file mode 100755
index aa81d68..000
--- a/scripts/maint/find-dead-funcs
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-SOURCE_DIR=sbws
-TESTS_DIR=tests
-
-UNUSED_LOG=unused-funcs.txt
-USED_LOG=used-funcs.txt
-
-cat > $USED_LOG <> $UNUSED_LOG
-else
-echo "$FUNC" >> $USED_LOG
-echo "$USAGE_INFO" >> $USED_LOG
-fi
-done
-}
-
-echo "Writing unused function names to $UNUSED_LOG"
-echo "Writing used function names and information to $USED_LOG"
-
-get_all_funcs | get_func_usage_count
diff --git a/setup.py b/setup.py
index 9db8731..d704d92 100755
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,8 @@ setup(
 "git+https://git.torproject.org/stem.git#egg=stem-1.6.0.dev0;,
 ],
 extras_require={
-'dev': ['flake8'],
+# vulture: find unused code
+'dev': ['flake8', 'vulture'],
 'test': ['tox', 'pytest', 'coverage'],
 # recommonmark: to make sphinx render markdown
 'doc': ['sphinx', 'recommonmark', 'pylint'],



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Explain how to open a ticket

2018-09-25 Thread juga
commit 09396d77d886c35627883cd6be4b1bf6b807b4f1
Author: juga0 
Date:   Tue Sep 18 14:57:17 2018 +

Explain how to open a ticket
---
 CONTRIBUTING.rst | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 22c7e3e..b35de63 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -13,10 +13,13 @@ Examples of contributions include:
 Bug reports or feature requests
 -
 
-Check that bug has not been already reported.
-To report bugs or request features, open a ticket in
-`Tor Project Trac `_
-and assign the component to ``Core Tor``/``sbws``.
+* Check that it has not been already reported.
+
+.. _ticket-ref:
+
+* Open a ticket in
+  `Tor Project Trac `_
+  and assign the component to ``Core Tor``/``sbws``.
 
 Code/documentation patches
 ---



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove symlink to LICENSE, it is already mentioned

2018-09-25 Thread juga
commit 5caef8ff37b7821559f91d9683fba71abfc020e1
Author: juga0 
Date:   Tue Sep 18 15:04:46 2018 +

Remove symlink to LICENSE, it is already mentioned
---
 docs/source/LICENSE.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/LICENSE.md b/docs/source/LICENSE.md
deleted file mode 12
index f0608a6..000
--- a/docs/source/LICENSE.md
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE.md
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rephrase, add links, remove :term:

2018-09-25 Thread juga
commit 68baee690cfa1340f8dd05d64dd876629d05e1e2
Author: juga0 
Date:   Tue Sep 18 15:02:11 2018 +

Rephrase, add links, remove :term:
---
 DEPLOY.rst | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 8d4a9ce..bbf40f0 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -3,17 +3,17 @@
 Deploying Simple Bandwidth Scanner
 =
 
-So you want to run sbws for yourself. You will need
+To run sbws is needed:
 
 - A machine to run the :term:`scanner`.
 - One or more :term:`destination` (s) that serve a large file.
 
-Both :term:`scanner` and your :term:`destination` (s) should be on fast,
+Both the ``scanner`` and your the ``destination``(s) should be on fast,
 well connected machines.
 
 .. _destinations_requirements:
 
-:term:`destination` requirements
+destination requirements
 
 
 - A Web server installed and running that supports HTTP GET, HEAD and
@@ -22,15 +22,15 @@ well connected machines.
 - Optional support for TLS
 - A large file; at the time of writing, at least 1 GiB in size
 
-:term:`scanner` setup
+scanner setup
 --
 
-Install sbws according to :doc:`/INSTALL`.
-
-``sbws scanner`` needs :term:`destination` (s) to request files from.
-They are not included by default.
+Install sbws according to ``./INSTALL.rst`` (or `/INSTALL.rst `_
+or :ref:`install`).
 
 To configure destinations, create a configuration file according to
-:doc:`man_sbws.ini`
+``./docs/source/man_sbws.ini.rst`` (or `/docs/source/man_sbws.ini.rst 
`_
+or :doc:`man_sbws.ini` or ``man sbws.ini``)
 
-See also :doc:`sbws.ini` manual page.
+See also ``/docs/source/man_sbws.rst`` (or `/docs/source/man_sbws.rst`_ or
+:doc:`man_sbws` or ``man sbws``) manual page.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Update Debian installation info

2018-09-25 Thread juga
commit 4945230f62a7eecdf2d37dcd43ea94ca383939cd
Author: juga0 
Date:   Mon Sep 17 15:22:21 2018 +

Update Debian installation info
---
 INSTALL.rst | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 5ad7875..04bdac2 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -3,10 +3,18 @@
 Installing Simple Bandwidth Scanner
 ===
 
-The prefered method to install ``sbws`` is to install it from your system
+The recommended method  is to install it from your system
 distribution.
-Currently there is not any system distribution package.
-In the meantime, follow the following steps.
+
+In Debian/Ubuntu systems::
+
+sudo apt install sbws
+
+To install also the documentation::
+
+sudo apt install sbws-doc
+
+Continue reading to install ``sbws`` in other ways.
 
 System requirements
 
@@ -46,7 +54,9 @@ Install the python dependencies::
an ``stem`` release > 1.6.0
 
 ``sbws`` needs :term:`destination` s to request files from.
-Please, see :ref:`deploy` to know how to configure, deploy and run ``sbws``.
+
+Please, see ./DEPLOY.rst (or `/DEPLOY.rst `_ or :ref:`deploy`)
+to configure, deploy and run ``sbws``.
 
 System physical requirements
 -
@@ -81,6 +91,3 @@ are 10MB and it will keep 50 rotated log files.
 .. _pytest: https://docs.pytest.org/
 .. _tox: https://tox.readthedocs.io
 .. _Coverage: https://coverage.readthedocs.io/
-.. _Sphinx: http://www.sphinx-doc.org
-.. _recommonmark: https://recommonmark.readthedocs.io/
-.. _Pylint: https://www.pylint.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Fix identation in docstring

2018-09-25 Thread juga
commit e0cc70853e55fff7e7273aed270ea8a9417f92ef
Author: juga0 
Date:   Tue Sep 25 09:00:06 2018 +

Fix identation in docstring
---
 sbws/lib/relaylist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index aa197c0..58cae75 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -91,7 +91,8 @@ class Relay:
 """Obtain ed25519 master key of the relay in server descriptors.
 
 :returns: str, the ed25519 master key base 64 encoded without
-trailing '='s.
+  trailing '='s.
+
 """
 # Even if this key is called master-key-ed25519 in dir-spec.txt,
 # it seems that stem parses it as ed25519_master_key



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add roadmap

2018-09-25 Thread juga
commit 3dbb89bb01164839dbd7ee8bc673bce5fe0c0471
Author: juga0 
Date:   Tue Sep 18 17:55:38 2018 +

Add roadmap
---
 docs/source/index.rst   |  1 +
 docs/source/roadmap.rst | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2a16343..303bddc 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -40,6 +40,7 @@ Included in the
specification
faq
glossary
+   roadmap
layout
config_tor
testing
diff --git a/docs/source/roadmap.rst b/docs/source/roadmap.rst
new file mode 100644
index 000..4fc4b01
--- /dev/null
+++ b/docs/source/roadmap.rst
@@ -0,0 +1,15 @@
+.. _roadmap:
+
+Roadmap
+
+
+Release 1.0.0
+--
+
+Autum 2018
+- Minimal Viable Product (MVP)
+
+Release 1.1.0
+--
+
+TBD
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add entry in changelog about doc cleanup

2018-09-25 Thread juga
commit cd9ac1881c8893524e5ec85d55331fa56568f653
Author: juga0 
Date:   Tue Sep 18 19:46:56 2018 +

Add entry in changelog about doc cleanup
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c991d1a..933b311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,8 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 - refactor v3bwfile (#27386): move scaling method inside class
 - use custom ``install_command`` to test installation commands while
   ``dependency_links`` is needed until #26914 is fixed. (#27704)
+- documentation cleanup (#27773)
+  - split, merge, simplify, extend, reorganize sections and files
 
 ## [0.7.0] - 2018-08-09
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Create page for documentation instructions

2018-09-25 Thread juga
commit 364390f90298af0eb7ec650014871198231c719c
Author: juga0 
Date:   Tue Sep 18 15:04:24 2018 +

Create page for documentation instructions
---
 DOCUMENTATION.rst => docs/source/documenting.rst | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/DOCUMENTATION.rst b/docs/source/documenting.rst
similarity index 59%
rename from DOCUMENTATION.rst
rename to docs/source/documenting.rst
index 6410f2c..c610121 100644
--- a/DOCUMENTATION.rst
+++ b/docs/source/documenting.rst
@@ -1,4 +1,4 @@
-.. _documentation:
+.. _documenting:
 
 Installing documentation dependendencies and building it
 -
@@ -30,3 +30,18 @@ To build the documentation diagrams::
 cd docs/ && make umlsvg
 
 The generated diagrams will be in ``docs/build/_images/``.
+
+To convert the ``LaTeX`` mathematical formulae to images, extra system 
dependencies
+are needed:
+
+- Core and Extra Tex_ Live packages
+
+They are included in most distributions. In Debian install them running::
+
+apt install texlive-latex-extra
+
+
+.. _Sphinx: http://www.sphinx-doc.org
+.. _recommonmark: https://recommonmark.readthedocs.io/
+.. _Pylint: https://www.pylint.org/
+.. _Tex: http://www.tug.org/texlive/acquire.html



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Fix underline title too short

2018-09-25 Thread juga
commit 0e6aa33cf3bf81ed1983a4ed0d2c14f574e7f914
Author: juga0 
Date:   Tue Sep 25 09:08:47 2018 +

Fix underline title too short
---
 docs/source/sbws.util.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/sbws.util.rst b/docs/source/sbws.util.rst
index a1b3840..30ac43d 100644
--- a/docs/source/sbws.util.rst
+++ b/docs/source/sbws.util.rst
@@ -29,7 +29,7 @@ sbws.util.parser module
 :show-inheritance:
 
 sbws.util.state module
-~
+~~
 
 .. automodule:: sbws.util.state
 :members:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove title, add label

2018-09-25 Thread juga
commit b14fd0f0cb4d384d5bef0c714e7849f0fa3a1bdb
Author: juga0 
Date:   Tue Sep 18 15:07:02 2018 +

Remove title, add label
---
 docs/source/config.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/source/config.rst b/docs/source/config.rst
index 0c80ad3..cafe5fe 100644
--- a/docs/source/config.rst
+++ b/docs/source/config.rst
@@ -1,5 +1,4 @@
-Simple Bandwidth Scanner Configuration Files
-
+.. _config_internal:
 
 How sbws configuration works internally
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Fix term syntax

2018-09-25 Thread juga
commit 499ad09863657a8260c6d8d414ad35ee0dcb39ea
Author: juga0 
Date:   Tue Sep 18 15:10:38 2018 +

Fix term syntax
---
 docs/source/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index 07e820a..4b0f6a2 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -22,7 +22,7 @@ How do sbws scanner results end up in the consensus?
 
 The :term:`sbws scanner` runs continuously to gather fresh data.
 
-The :term `sbws generate` command takes the fresh data and generates a
+The :term:`sbws generate` command takes the fresh data and generates a
 :term:`v3bw file`.
 
 The Tor :term:`directory authority` parses the v3bw file and includes bandwidth



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Create page for testing instructions

2018-09-25 Thread juga
commit 62beb662b2a4f85f6c5dfb282b222a498f4ade30
Author: juga0 
Date:   Tue Sep 18 15:04:10 2018 +

Create page for testing instructions
---
 TESTING.rst => docs/source/testing.rst | 5 +
 1 file changed, 5 insertions(+)

diff --git a/TESTING.rst b/docs/source/testing.rst
similarity index 67%
rename from TESTING.rst
rename to docs/source/testing.rst
index a75aeaa..6a65d58 100644
--- a/TESTING.rst
+++ b/docs/source/testing.rst
@@ -17,3 +17,8 @@ To install them from ``sbws`` ::
 To run the tests::
 
 tox
+
+.. _Flake8: http://flake8.pycqa.org/
+.. _pytest: https://docs.pytest.org/
+.. _tox: https://tox.readthedocs.io
+.. _Coverage: https://coverage.readthedocs.io/
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add editorconfig file and note in contributing

2018-09-25 Thread juga
commit ecc69751086250fa93cf6d8312c90271245aa7f1
Author: juga0 
Date:   Tue Sep 18 18:05:43 2018 +

Add editorconfig file and note in contributing
---
 .editorconfig| 27 +++
 CONTRIBUTING.rst |  3 +++
 2 files changed, 30 insertions(+)

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..696cda3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,27 @@
+# this should work for all editors that support .editorconfig!
+#
+# on debian, emacs users should install elpa-editorconfig and vim
+# users should install vim-editorconfig.
+
+root = true
+
+[*]
+indent_style = space
+# this remove EOF new line with some editors
+# insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+max_line_length = 79
+
+[*.py]
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+[*.ini]
+indent_size = 4
+
+[*.yml]
+indent_size = 2
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 186169b..aeeadad 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -98,6 +98,9 @@ External link: `Documentation 
`_ will
+help you to follow the general formatting code style.
+
 Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Clarify title

2018-09-25 Thread juga
commit 8018bd8ed8750babf38cd715045b8c1abb0a8a27
Author: juga0 
Date:   Tue Sep 18 15:16:49 2018 +

Clarify title
---
 docs/source/sbws.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/sbws.rst b/docs/source/sbws.rst
index 3e679e6..3c78a63 100644
--- a/docs/source/sbws.rst
+++ b/docs/source/sbws.rst
@@ -1,5 +1,5 @@
-Simple Bandwidth Scanner package
-
+sbws package API
+=
 
 Subpackages
 ---



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add page about tor config, removed from specification

2018-09-25 Thread juga
commit ab62732b99db9efaa0ff8cb2d424317cf40df6c3
Author: juga0 
Date:   Tue Sep 18 17:53:58 2018 +

Add page about tor config, removed from specification
---
 docs/source/config_tor.rst | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst
new file mode 100644
index 000..1ddde81
--- /dev/null
+++ b/docs/source/config_tor.rst
@@ -0,0 +1,18 @@
+.. _config_tor:
+
+sbws scanner tor configuration
+---
+
+At the time of writing, sbws sets the following torrc options for the following
+reasons when it launches Tor. You can find them in ``sbws/globals.py`` and
+``sbws/util/stem.py``.
+
+- ``SocksPort auto``: To proxy requests over Tor.
+- ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
+- ``LearnCircuitBuildTimeout 0``: To keep circuit build timeouts static.
+- ``CircuitBuildTimeout 10``: To give up on struggling circuits sooner.
+- ``UseEntryGuards 0``: To avoid path bias warnings.
+- ``DataDirectory ...``: To set Tor's datadirectory to be inside sbws's.
+- ``PidFile ...``: To make it easier to tell if Tor is running.
+- ``ControlSocket ...``: To control Tor.
+- ``Log notice ...``: To know what the heck is going on.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Divide TOC in sections, rearange pages order

2018-09-25 Thread juga
commit 9b40dc1880531559007b65411d728dbdd4934bcf
Author: juga0 
Date:   Tue Sep 18 15:15:49 2018 +

Divide TOC in sections, rearange pages order
---
 docs/source/index.rst | 49 ++---
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 098268d..2a16343 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -6,40 +6,59 @@
 Welcome to Simple Bandwidth Scanner's documentation!
 
 
-Contents
-
+User main documentation
+
+
+Included in the
+`repository root `_
+and in ``sbws`` Debian package:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
-   specification
-   config
+   README
INSTALL
DEPLOY
-   README
-   man_sbws
-   man_sbws.ini
-   CHANGELOG
CONTRIBUTING
+   CHANGELOG
AUTHORS
-   LICENSE
+   man_sbws
+   man_sbws.ini
+
+.. _dev_doc:
+
+Developer/technical documentation
+--
+
+Included in the
+`docs directory `_ and in
+``sbws-doc`` Debian package:
+
+.. toctree::
+   :maxdepth: 1
+
+   specification
faq
glossary
-   diagrams
+   layout
+   config_tor
+   testing
+   documenting
state
+   config
+   diagrams
sbws
 
-Proposals
--
+Proposals:
 
 .. toctree::
-   :glob:
:maxdepth: 1
+   :glob:
 
proposals/*
 
 Indices and tables
-==
+---
 
 * :ref:`genindex`
 * :ref:`modindex`



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Move UML word between sections

2018-09-25 Thread juga
commit a0764976782ed5893cd3fc151ff4eada6d6802af
Author: juga0 
Date:   Tue Sep 18 15:07:44 2018 +

Move UML word between sections
---
 docs/source/diagrams.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/diagrams.rst b/docs/source/diagrams.rst
index 92652c5..ec18ed3 100644
--- a/docs/source/diagrams.rst
+++ b/docs/source/diagrams.rst
@@ -1,7 +1,7 @@
-Diagrams
-=
+UML diagrams
+=
 
-UML Class Diagram
+Class Diagram
 
 
 .. image:: ./images/classes_sbws.*



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Fix formula scaping latex in docstring

2018-09-25 Thread juga
commit 6597f3554445b57d78eebfb6beea20f60332a6fd
Author: juga0 
Date:   Tue Sep 25 08:00:26 2018 +

Fix formula scaping latex in docstring
---
 sbws/lib/v3bwfile.py | 70 ++--
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index afed0b1..0bbead1 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -695,45 +695,45 @@ class V3BWFile(object):
 All of that can be expressed as:
 
 .. math::
-   :label:torflow_bwn_eq
-
-bwn_i =&
-max\left(
-\frac{bw_i}{\mu},
-\frac{bwf_i}{\mu_{bwf}}
-\right)
-\times bwobs_i\\
+
+bwn_i &=
+max\\left(
+\\frac{bw_i}{\\mu},
+\\frac{bwf_i}{\\mu_{bwf}}
+\\right)
+\\times bwobs_i
 
 .. math::
 
- bwn_i =&
-max\left(
-\frac{bw_i}{\mu},
-min \left(
+ bwn_i &=
+max\\left(
+\\frac{bw_i}{\\mu},
+min \\left(
+bw_i,
+bw_i \\times \\mu
+\\right)
+\\times
+\\frac{bw_i}{\\sum_{i=1}^{n}
+min \\left(bw_i,
+bw_i \\times \\mu
+\\right)}
+\\right)
+\\times bwobs_i \\
+
+ &=
+max\\left(
+\\frac{bw_i}{\\frac{\\sum_{i=1}^{n}bw_i}{n}},
+min \\left(
 bw_i,
-bw_i \times \mu
-\right)
-\times
-\frac{bw}{\sum_{i=1}^{n}
-min \left(bw_i,
-bw_i \times \mu
-\right)}
-\right)
-\times bwobs_i \\
-  =&
-max\left(
-  \frac{bw_i}{\frac{\sum_{i=1}^{n}bw_i}{n}},
-  min \left(
-  bw_i,
-  bw_i \times \frac{\sum_{i=1}^{n}bw_i}{n}
-  \right)
-  \times
-  \frac{bw}{\sum_{i=1}^{n}
-  min \left(bw_i,
-  bw_i \times \frac{\sum_{i=1}^{n}bw_i}{n}
-  \right)}
-  \right)
-  \times bwobs_i
+bw_i \\times \\frac{\\sum_{i=1}^{n}bw_i}{n}
+\\right)
+\\times
+\\frac{bw_i}{\\sum_{i=1}^{n}
+min \\left(bw_i,
+bw_i \\times \\frac{\\sum_{i=1}^{n}bw_i}{n}
+\\right)}
+\\right)
+\\times bwobs_i
 
 """
 log.info("Calculating relays' bandwidth using Torflow method.")



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Move sections

2018-09-25 Thread juga
commit b47d4bef41a2ac271fb31d43c63ba6abacce64dc
Author: juga0 
Date:   Tue Sep 18 15:00:18 2018 +

Move sections
---
 CONTRIBUTING.rst | 194 ---
 1 file changed, 158 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b35de63..186169b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -87,81 +87,203 @@ Code should adhere to the :pep:`8` guidelines.
 Before release 1.0.0, some guidelines have not been followed,
 such as the ordering the inputs (:pep:`8#imports`).
 
-Any non-trivial change should contain tests. See ./TESTING.rst.
-When running tests, currently ``flake8`` informs on some PEP8 errors/warnings,
-but not all.
+External link: `Code Style `_
 
 All functions, methods and classes should have :pep:`0257`
 (except ``__repr__`` and ``__str__``).
 Before release 1.0.0, some docstrigs do not have 3 double quotes ``"""``
 (:pep:`0257#id15`).
 
-New features should add a corresponding documentation.
+External link: `Documentation 
`_
 
-Document your changes in ./CHANGELOG.rst following `keep a changelog`_.
-Reference the Tor Project Trac ticket (example: ``#12345``) or
-Github ticket (example: ``GH#123``).
+New features should add a corresponding documentation in /docs.
 
 Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_
 
-Git workflow
-
+Functional style is prefered:
 
-Commits
-
+- use list comprenhensions lambda, map, reduce
+- avoid reasigigning variables, instead create new ones
+- use ``deepcopy`` when passing list of objects to a function/method
+- classes should change attributes only in one method (other than __init__?)
 
-Commit messages should follow the `Tim Pope`_ recommendations.
+[FUNC]_
 
-Workflow
+In general, do not reinvent the wheel, use Python native modules as 
``logging``,
+instead of implementing similar functionality.
+Or use other packages when the new dependency can be extra, for instance
+`vulture`_.
+
+.. _`extrafiles-ref`:
+
+Extra required files
+~
+
+Any non-trivial change should contain tests. See ./TESTING.rst.
+When running tests, currently ``flake8`` informs on some PEP8 errors/warnings,
+but not all.
+
+Document your changes in ./CHANGELOG.rst following `keep a changelog`_.
+Reference the Tor Project Trac ticket (example: ``#12345``) or
+Github ticket (example: ``GH#123``).
+
+.. _commits-ref:
+
+Commits
 ~
 
-In general, when you are modifying code that was not wrotten by yourself,
-try to keep changes to the minimum.
+Try to make each commit a logically separate changes.::
+
+  As a general rule, your messages should start with a single line that’s
+  o more than about 50 characters and that describes the changeset concisely,
+  followed by a blank line, followed by a more detailed explanation.
+  The Git project requires that the more detailed explanation include
+  your motivation for the change and contrast its implementation with
+  previous behavior — this is a good guideline to follow.
+  It’s also a good idea to use the imperative present tense in these 
messages.
+  In other words, use commands.
+  Instead of "I added tests for" or "Adding tests for," use "Add tests for."
+
+[DIST]_
+
+Template originally written by `Tim Pope`_: :ref:`example commit `
+
+Code being reviewed workflow
+~
 
 When a PR is being reviewed, new changes might be needed:
 
-- If the change does not modify a previous change, just commit and push.
+- If the change does not modify a previous change, create new commits and push.
 - If the change modifies a previous change and it's small,
   `git commit fixup 
`_
   should be used. When it is agreed that the PR is ready, create a new branch
-  named ``mybranch_02`` and run::
+  named ``mybranch_02`` and run:
+
+  .. code-block:: bash
 
 rebase --autosquash
 
   push, create new PR and close old PR mentioning the number of the new PR.
 - If the review takes long and when it's ready code related to the PR has 
changed
-  in master, create a new branch named ``mybranch_02`` and run::
+  in master, create a new branch named ``mybranch_02`` and run:
+
+  .. code-block:: bash
 
 rebase master
 
   push, create new PR and close old PR mentioning the number of the new PR.
 
-Reviewers: (see :ref:`reviewers`)
+[MERG]_
 
-- should not push code to your branch, unless you agree
-- should let you know when new changes are needed
-- should not merge your PR after changes are requested and you notify you did
-  via the PR or the ticket.
-- should not merge your PR and then inmediatly modify your code pushing
-  directly to master without 

[tor-commits] [sbws/master] Clarify steps to submit code

2018-09-25 Thread juga
commit 9467ccd67aeb943b96389019ee09a4c6df085929
Author: juga0 
Date:   Fri Sep 14 18:53:50 2018 +

Clarify steps to submit code
---
 CONTRIBUTING.rst | 37 -
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d7e2822..b109ee5 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -16,19 +16,30 @@ To report bugs or request features, open a ticket in
 `Tor Project Trac `_
 and assign the component to ``Core Tor``/``sbws``.
 
-
-Pull requests are welcome, especially if they address open issues.
-
-#. Fork the repo on GitHub
-#. Clone a copy of sbws to your machine as per
-   :doc:`the install instructions `, but use your repo.
-#. Fix that bug or implement that feature
-- As part of this process, it would be appreciated (and might event help
-  you) if you wrote tests to catch the buggy behavior you're solving so it
-  won't break again.
-#. Make sure all tests pass when running ``tox``.
-#. Commit your changes and push them to a branch in your sbws GitHub repo
-#. Open a `pull request`_
+Code/documentation patches
+---
+
+The sbws canonical repository is https://gitweb.torproject.org/sbws.git,
+but we review patches using the Github canonical repository
+(https://github.com/torproject/sbws) Pull Requests (PR).
+
+Steps:
+
+1. Create a ticket in Tor Project Trac as explained above
+2. Clone ``sbws`` via the Github web interface
+   https://github.com/torproject/sbws
+3. Clone the repository locally
+4. Install ``sbws`` as explained in ./INSTALL.rst and TESTING.rst
+   Use ``pip install -e <>``
+5. If needed install the documentation and build it as explained in
+   ./DOCUMENTATION.rst
+6. Create a new branch, named ``ticketXXX``.
+   Optionally, name it with a string explaining what it does,
+   ie ``ticketXXX_contributing``
+7. Write code, create tests, commit, etc.
+8. Ensure tests pass.
+9. Create a PR from your branch to https://github.com/torproject/sbws
+10. Change the ticket status to ``needs_review``
 
 We use flake8 to check some PEP8 errors/warnings. This will be checked with
 ``tox`` and Travis.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rename title, add note about future specification

2018-09-25 Thread juga
commit dea1bfc86f744979b8a2cbd1caddd5763e5b5a03
Author: juga0 
Date:   Tue Sep 18 13:58:15 2018 +

Rename title, add note about future specification

currently it contains more design and engineering details
that specific algorithms of the components
---
 docs/source/specification.rst | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/source/specification.rst b/docs/source/specification.rst
index 0b76be5..fb2dd8c 100644
--- a/docs/source/specification.rst
+++ b/docs/source/specification.rst
@@ -1,11 +1,14 @@
-Simple Bandwidth Scanner Specification
-==
+Simple Bandwidth Scanner technical details
+
 
-:Author: Matt Traudt
+:Author: Matt Traudt, juga
 :Date: 29 March 2018
-:Last Update: 29 May 2018
+:Last Update: 19 Sep 2018
 :Status: Draft
 
+.. note:: this document may become an specification of the ``sbws`` method to
+   measure relays and/or scale the measuremensts
+
 Conventions
 ---
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rephrase and extend code style and PR steps

2018-09-25 Thread juga
commit 2b9b1158c919c817951b0ebe8a68a8e2839592e2
Author: juga0 
Date:   Tue Sep 18 17:17:16 2018 +

Rephrase and extend code style and PR steps
---
 CONTRIBUTING.rst | 68 +++-
 1 file changed, 57 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b109ee5..b2b96eb 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -23,29 +23,75 @@ The sbws canonical repository is 
https://gitweb.torproject.org/sbws.git,
 but we review patches using the Github canonical repository
 (https://github.com/torproject/sbws) Pull Requests (PR).
 
-Steps:
+To know more about ``sbws`` code,
 
-1. Create a ticket in Tor Project Trac as explained above
+.. seealso::
+
+  - :ref:`dev_doc`
+  - ``./docs/source/testing.rst`` (or `testing `_
+or :ref:`testing`).
+  - ``./docs/source/documenting.rst`` (or `documenting 
`_
+or :ref:`documenting`).
+
+The following are guidelines we aim to follow.
+
+Steps to create a PR
+~
+
+1. Create a ticket in Tor Project Trac (:ref:`Open ticket `)
 2. Clone ``sbws`` via the Github web interface
https://github.com/torproject/sbws
 3. Clone the repository locally
-4. Install ``sbws`` as explained in ./INSTALL.rst and TESTING.rst
+4. Install ``sbws`` as explained in ./INSTALL.rst and ./TESTING.rst
Use ``pip install -e <>``
 5. If needed install the documentation and build it as explained in
./DOCUMENTATION.rst
 6. Create a new branch, named ``ticketXXX``.
Optionally, name it with a string explaining what it does,
ie ``ticketXXX_contributing``
-7. Write code, create tests, commit, etc.
-8. Ensure tests pass.
-9. Create a PR from your branch to https://github.com/torproject/sbws
-10. Change the ticket status to ``needs_review``
+7. Write code (:ref:`codestyle-ref`), tests, documentation,
+   extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc.
+8. Ensure tests pass (./TESTING.rst).
+9. Push your branch to your repository. If you have an account in Travis,
+   you can see whether it pass the tests in Github and in
+   https://travis-ci.org/youruser/sbws/
+10. Create a PR from your branch to https://github.com/torproject/sbws
+11. Change the Trac ticket status to ``needs_review``
+
+.. _codestyle-ref:
+
+Code style
+~~
+
+Follow the Zen of Python (:pep:`20`)
+
+.. code-block:: pycon
+
+>>> import this
+The Zen of Python, by Tim Peters
+
+Beautiful is better than ugly.
+Explicit is better than implicit.
+Simple is better than complex.
+Complex is better than complicated.
+Flat is better than nested.
+Sparse is better than dense.
+Readability counts.
+
+Code should adhere to the :pep:`8` guidelines.
+Before release 1.0.0, some guidelines have not been followed,
+such as the ordering the inputs (:pep:`8#imports`).
+
+Any non-trivial change should contain tests. See ./TESTING.rst.
+When running tests, currently ``flake8`` informs on some PEP8 errors/warnings,
+but not all.
 
-We use flake8 to check some PEP8 errors/warnings. This will be checked with
-``tox`` and Travis.
+All functions, methods and classes should have :pep:`0257`
+(except ``__repr__`` and ``__str__``).
+Before release 1.0.0, some docstrigs do not have 3 double quotes ``"""``
+(:pep:`0257#id15`).
 
-Simple Bandwidth Scanner is moving towards 100% test coverage. Please help us
-reach that goal, or at least not move us away from it.
+New features should add a corresponding documentation.
 
 Git and GitHub Guidelines
 =



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rephrase timestamps format

2018-09-25 Thread juga
commit 34e566c3ef6be9956ca20e58f010ab8c8b2a6e54
Author: juga0 
Date:   Fri Sep 14 19:51:43 2018 +

Rephrase timestamps format
---
 CONTRIBUTING.rst | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b2b96eb..65a2349 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -93,6 +93,10 @@ Before release 1.0.0, some docstrigs do not have 3 double 
quotes ``"""``
 
 New features should add a corresponding documentation.
 
+Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
+Unix timestamps. Timestamps read by the user should be always formatted in
+`ISO 8601 `_
+
 Git and GitHub Guidelines
 =
 
@@ -119,12 +123,6 @@ a branch, add a version suffix (for example: "_02").
 Coding Guidelines
 =
 
-**Strongly prefer Unix timestamps or datetime objects in UTC** and always
-work in UTC for as long as possible. When reading/writing/manipulating results
-from some period of time in the past, always err on the side of caution. For
-example, open an extra file into the past just in case it happens to include
-result lines that have timestamps that are still considered valid (of course,
-ignore results in the file that are no longer valid).
 
 **Document your addition, fix, change, or whatever in the changelog**. See
 `keep a changelog`_ for the standard we follow. Of note, add Added, Changed,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Stop using simple-bw-scanner in docs

2018-09-25 Thread juga
commit 9aa0813343964702e6f265d7796cce22ae1f4104
Author: juga0 
Date:   Mon Sep 17 14:09:40 2018 +

Stop using simple-bw-scanner in docs
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36f0bb1..38cb183 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build 
Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://travis-ci.org/https://travis-ci.org/torproject/sbws)
 
-`simple-bw-scanner` (also called `sbws`) is a Tor bandwidth scanner that
+Simple Bandwidth Scanner (called `sbws`) is a Tor bandwidth scanner that
 produces bandwidth measurements files to be used by Directory Authorities.
 
 The scanner builds two hop circuits consisting of the relay being measured and



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Move building documentation to a different file

2018-09-25 Thread juga
commit 4075c4d725c9a2adc96a43a8dde89bd8c54c1e50
Author: juga0 
Date:   Fri Sep 14 18:51:15 2018 +

Move building documentation to a different file
---
 DOCUMENTATION.rst | 32 
 INSTALL.rst   | 31 ---
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/DOCUMENTATION.rst b/DOCUMENTATION.rst
new file mode 100644
index 000..6410f2c
--- /dev/null
+++ b/DOCUMENTATION.rst
@@ -0,0 +1,32 @@
+.. _documentation:
+
+Installing documentation dependendencies and building it
+-
+
+To build the documentation, extra Python dependencies are needed:
+
+- Sphinx_
+- recommonmark_
+- Pylint_ (only to update the diagrams)
+
+To install them from ``sbws``::
+
+pip install .[doc]
+
+To build the documentation as HTML::
+
+cd docs/ && make html
+
+The generated HTML will be in ``docs/build/``.
+
+To build the manual (``man``) pages::
+
+cd docs/ && make man
+
+The generated man pages will be in ``docs/man/``.
+
+To build the documentation diagrams::
+
+cd docs/ && make umlsvg
+
+The generated diagrams will be in ``docs/build/_images/``.
diff --git a/INSTALL.rst b/INSTALL.rst
index 5832f3b..5ad7875 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -48,37 +48,6 @@ Install the python dependencies::
 ``sbws`` needs :term:`destination` s to request files from.
 Please, see :ref:`deploy` to know how to configure, deploy and run ``sbws``.
 
-Installing documentation dependendencies and building it
--
-
-To build the documentation, extra Python dependencies are needed:
-
-- Sphinx_
-- recommonmark_
-- Pylint_ (only to update the diagrams)
-
-To install them from ``sbws``::
-
-pip install .[doc]
-
-To build the documentation as HTML::
-
-cd docs/ && make html
-
-The generated HTML will be in ``docs/build/``.
-
-To build the manual (``man``) pages::
-
-cd docs/ && make man
-
-The generated man pages will be in ``docs/man/``.
-
-To build the documentation diagrams::
-
-cd docs/ && make umlsvg
-
-The generated diagrams will be in ``docs/build/_images/``.
-
 System physical requirements
 -
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add contributing label

2018-09-25 Thread juga
commit 6e7b683be32ec123a620bc3be64f1031609204c9
Author: juga0 
Date:   Tue Sep 18 14:55:48 2018 +

Add contributing label
---
 CONTRIBUTING.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ec8bdcc..d0806dd 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,3 +1,5 @@
+.. _contributing:
+
 Contributing to Simple Bandwidth Scanner
 =
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove section to tor configuration page

2018-09-25 Thread juga
commit 41c42479aff51fc024434d7c8aa487a699156a40
Author: juga0 
Date:   Tue Sep 18 14:05:24 2018 +

Remove section to tor configuration page
---
 docs/source/specification.rst | 17 -
 1 file changed, 17 deletions(-)

diff --git a/docs/source/specification.rst b/docs/source/specification.rst
index fb2dd8c..3d870ef 100644
--- a/docs/source/specification.rst
+++ b/docs/source/specification.rst
@@ -89,23 +89,6 @@ Sbws uses the python library Stem_ to launch and control tor 
and the python
 library Requests_ to make HTTP(S) requests. Both are generally packaged for
 most major Linux distributions, and are always available in PyPI.
 
-Configuring the sbws scanner
-
-
-At the time of writing, sbws sets the following torrc options for the following
-reasons when it launches Tor. You can find them in ``sbws/globals.py`` and
-``sbws/util/stem.py``.
-
-- ``SocksPort auto``: To proxy requests over Tor.
-- ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
-- ``LearnCircuitBuildTimeout 0``: To keep circuit build timeouts static.
-- ``CircuitBuildTimeout 10``: To give up on struggling circuits sooner.
-- ``UseEntryGuards 0``: To avoid path bias warnings.
-- ``DataDirectory ...``: To set Tor's datadirectory to be inside sbws's.
-- ``PidFile ...``: To make it easier to tell if Tor is running.
-- ``ControlSocket ...``: To control Tor.
-- ``Log notice ...``: To know what the heck is going on.
-
 How it all works
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Update link to canonical gh repo in travis

2018-09-25 Thread juga
commit 0bfb913648ffe68cd7ea960bb53e566fc43b6d56
Author: juga0 
Date:   Mon Sep 17 14:07:25 2018 +

Update link to canonical gh repo in travis
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0c7ec8..36f0bb1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Readme
 
-[![Build 
Status](https://travis-ci.org/pastly/simple-bw-scanner.svg?branch=master)](https://travis-ci.org/pastly/simple-bw-scanner)
+[![Build 
Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://travis-ci.org/https://travis-ci.org/torproject/sbws)
 
 `simple-bw-scanner` (also called `sbws`) is a Tor bandwidth scanner that
 produces bandwidth measurements files to be used by Directory Authorities.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Create sections for links to documentation

2018-09-25 Thread juga
commit 164cc7b4ef29f64e7089acffe0d6a95f40566208
Author: juga0 
Date:   Mon Sep 17 14:59:47 2018 +

Create sections for links to documentation
---
 README.md | 35 ---
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 38cb183..99466f0 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,35 @@ authorities or researches using a test Tor network, chutney 
or shadow.
 Please, do not run this software otherwise, since the measurements would not be
 used by Tor and would only create more traffic in the Tor network.
 
-See ./INSTALL.rst) for install instructions,
-[./DEPLOY.rst](./DEPLOY.rst) for deploy instructions,
-[./CONTRIBUTING](./CONTRIBUTING.rst) for contribution guidelines.
-===
-`sbws` will be considered production ready when version 1.0.0 will be releases.
+`sbws` will be considered production ready when version 1.0.0 will be released.
+
+Installing
+
+
+See ./INSTALL.rst (or  [INSTALL](./INSTALL.rst) or [INSTALL](./INSTALL.html) )
+
+Deploying and running
+-
+
+See ./DEPLOY.rst (or  [DEPLOY](./DEPLOY.rst) or [DEPLOY](./DEPLOY.html) )
+
+Contributing
+--
+
+See ./CONTRIBUTING.rst (or  [CONTRIBUTING](./CONTRIBUTING.rst) or
+[CONTRIBUTING](./CONTRIBUTING.html) )
+
+Changelog
+--
+
+See ./CHANGELOG.rst (or  [CHANGELOG](./CHANGELOG.rst) or
+[CHANGELOG](./CHANGELOG.html) )
+
+Documentation
+--
 
 More extensive documentation can be found in the ./docs directory,
-also online at https://sbws.readthedocs.io and
+and online at [sbws.rtfd.io](https://sbws.readthedocs.io) and
 [this onion 
service](http://d7pxflytfsmz6uh3x7i2jxzzwea6nbpmtsz5tmfkcin5edapaig5vpyd.onion/)
 ([v2](http://sdmb3rfvp3wadu6y.onion/)).
 
@@ -36,4 +57,4 @@ software in ./LICENSE.md
 
 ## Authors
 
-See ./AUTHORS.md
\ No newline at end of file
+See ./AUTHORS.md (or  [AUTHORS](./AUTHORS.MD)
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Clarify workflow

2018-09-25 Thread juga
commit d03a71a482ee048dc768071ea86fa9740eb508f8
Author: juga0 
Date:   Fri Sep 14 20:47:40 2018 +

Clarify workflow
---
 CONTRIBUTING.rst | 53 ++---
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 586bc13..ec8bdcc 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -109,22 +109,53 @@ Commits
 
 Commit messages should follow the `Tim Pope`_ recommendations.
 
-**Prefer a rebase workflow instead of merge**. Incorporating PRs should be done
-with fast-forward merge, if easily possible. The larger the topic branch, the
-harder this may be, so merge commits are allowed.
+Workflow
+~
 
-If, while working on a topic branch, some changes are made to master that
-conflict with your work or that you need to incorporate into your work, **do
-not merge master into your topic branch**; instead, rebase your topic branch on
-top of master or cherry-pick the changes.
+In general, when you are modifying code that was not wrotten by yourself,
+try to keep changes to the minimum.
 
-**Do not force push lightly** unless branches are clearly labeled as ones that
-may get overwritten (for example: "transient\_" prefix). Instead of overwriting
-a branch, add a version suffix (for example: "_02").
+When a PR is being reviewed, new changes might be needed:
 
+- If the change does not modify a previous change, just commit and push.
+- If the change modifies a previous change and it's small,
+  `git commit fixup 
`_
+  should be used. When it is agreed that the PR is ready, create a new branch
+  named ``mybranch_02`` and run::
 
+rebase --autosquash
 
-.. _pull request: https://github.com/pastly/simple-bw-scanner/compare
+  push, create new PR and close old PR mentioning the number of the new PR.
+- If the review takes long and when it's ready code related to the PR has 
changed
+  in master, create a new branch named ``mybranch_02`` and run::
+
+rebase master
+
+  push, create new PR and close old PR mentioning the number of the new PR.
+
+Reviewers: (see :ref:`reviewers`)
+
+- should not push code to your branch, unless you agree
+- should let you know when new changes are needed
+- should not merge your PR after changes are requested and you notify you did
+  via the PR or the ticket.
+- should not merge your PR and then inmediatly modify your code pushing
+  directly to master without informing you previously and without your consent.
+
+.. _reviewers:
+
+Reviewers
+--
+
+At the moment, there is not any policy to decide who the reviewers are.
+They are the current people that has contributed to this code: pastly, teor,
+juga0.
+They should not push directly to master and they should peer-review their code.
+Currently, if a PR from a reviewer has not been peer-reviewd by other reviewer
+in a week, the reviewer can merge their/her/his own PR.
+
+They should merge PR to master. Instead of rebase. If needed, rebase should be
+done by the contributor before the merge.
 
 .. _tim pope: 
https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Replace sbws by the full command (sbws scanner)

2018-09-25 Thread juga
commit f3b06eeb265a89989488373ab5416b3f60060b6b
Author: juga0 
Date:   Fri Sep 14 17:54:09 2018 +

Replace sbws by the full command (sbws scanner)
---
 docs/source/man_sbws.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst
index 1fccb9a..9d4b164 100644
--- a/docs/source/man_sbws.rst
+++ b/docs/source/man_sbws.rst
@@ -82,7 +82,7 @@ $HOME/.sbws/state.dat
A file for storing state needed between ``sbws`` commands.
 
 $XDG_RUNTIME_DIR/sbws
-  Runtime directory for the tor process launched by ``sbws``.
+  Runtime directory for the tor process launched by ``sbws scanner``.
 
 SEE ALSO
 -



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rename section, add feature requests

2018-09-25 Thread juga
commit f9511a348cb5c32f589cd9d7c1c9cdb0a34a7bcd
Author: juga0 
Date:   Tue Sep 18 14:56:36 2018 +

Rename section, add feature requests
---
 CONTRIBUTING.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d0806dd..22c7e3e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -10,8 +10,8 @@ Examples of contributions include:
 * Bug reports, feature requests
 * Code/documentation patches
 
-Bug reports
-
+Bug reports or feature requests
+-
 
 Check that bug has not been already reported.
 To report bugs or request features, open a ticket in



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add section git workflow, simplify commits

2018-09-25 Thread juga
commit 57df2a0ab4e8f704c893ba5a79dfcd5611eb5345
Author: juga0 
Date:   Fri Sep 14 20:07:01 2018 +

Add section git workflow, simplify commits

the reference to how to write commit messages should be enough.
---
 CONTRIBUTING.rst | 45 +
 1 file changed, 5 insertions(+), 40 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b61e220..586bc13 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -101,15 +101,13 @@ Timestamps must be in UTC. It is prefered to use 
``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_
 
-Git and GitHub Guidelines
-=
+Git workflow
+
 
-**Write good commit messages** that at least follow the spirit of
-:ref:`this example `.
+Commits
+
 
-Strive to **write many small commits** each containing an atomic change instead
-of one large mega-commit. This not only makes code review easier, but it also
-makes commits that show up in ``git blame`` 10 years from now make more sense.
+Commit messages should follow the `Tim Pope`_ recommendations.
 
 **Prefer a rebase workflow instead of merge**. Incorporating PRs should be done
 with fast-forward merge, if easily possible. The larger the topic branch, the
@@ -125,39 +123,6 @@ may get overwritten (for example: "transient\_" prefix). 
Instead of overwriting
 a branch, add a version suffix (for example: "_02").
 
 
-.. _commit-msg:
-
-Example commit message
-==
-
-With thanks to `Tim Pope`_:
-
-
-::
-
-Capitalized, short (50 chars or less) summary
-
-More detailed explanatory text, if necessary.  Wrap it to about 72
-characters or so.  In some contexts, the first line is treated as the
-subject of an email and the rest of the text as the body.  The blank
-line separating the summary from the body is critical (unless you omit
-the body entirely); tools like rebase can get confused if you run the
-two together.
-
-Write your commit message in the imperative: "Fix bug" and not "Fixed bug"
-or "Fixes bug."  This convention matches up with commit messages generated
-by commands like git merge and git revert.
-
-Further paragraphs come after blank lines.
-
-- Bullet points are okay, too
-
-- Typically a hyphen or asterisk is used for the bullet, followed by a
-  single space, with blank lines in between, but conventions vary here
-
-- Use a hanging indent
-
-
 
 .. _pull request: https://github.com/pastly/simple-bw-scanner/compare
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rephrase changelog documentation

2018-09-25 Thread juga
commit 997f5f4e366a75885b7f3f298a6e1de6b662a4a9
Author: juga0 
Date:   Fri Sep 14 20:01:14 2018 +

Rephrase changelog documentation
---
 CONTRIBUTING.rst | 16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 65a2349..b61e220 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -93,6 +93,10 @@ Before release 1.0.0, some docstrigs do not have 3 double 
quotes ``"""``
 
 New features should add a corresponding documentation.
 
+Document your changes in ./CHANGELOG.rst following `keep a changelog`_.
+Reference the Tor Project Trac ticket (example: ``#12345``) or
+Github ticket (example: ``GH#123``).
+
 Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_
@@ -120,18 +124,6 @@ top of master or cherry-pick the changes.
 may get overwritten (for example: "transient\_" prefix). Instead of overwriting
 a branch, add a version suffix (for example: "_02").
 
-Coding Guidelines
-=
-
-
-**Document your addition, fix, change, or whatever in the changelog**. See
-`keep a changelog`_ for the standard we follow. Of note, add Added, Changed,
-Deprecated, Removed, Fixed, and Security headings as needed in the Unreleased
-section. **If your change has a trac or GitHub ticket, reference it** like
-``(GH#123)`` or ``(trac#22104)``. When it comes time to do a release, the
-person doing the release should (1) change the name of the Unreleased section
-and add a new one, and (2) update the links at the bottom.
-
 
 .. _commit-msg:
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add authors

2018-09-25 Thread juga
commit a87e2fe823e5234b22a0004b487f3f644548c74a
Author: juga0 
Date:   Fri Sep 14 18:08:11 2018 +

Add authors
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 7985eac..9db8731 100755
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,8 @@ setup(
 description='Simple Bandwidth Scanner',
 long_description=long_description(),
 long_description_content_type="text/markdown",
-author='Matt Traudt',
-author_email='pas...@torproject.org',
+author='Matt Traudt, juga',
+author_email='{pastly, juga}@torproject.org',
 license='CC0',
 url="https://gitweb.torproject.org/sbws.git;,
 classifiers=[



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add missing link

2018-09-25 Thread juga
commit 4c69f0cb1a701be9354a5f3dd4f29dcc8b3a654d
Author: juga0 
Date:   Tue Sep 18 14:15:17 2018 +

Add missing link
---
 docs/source/specification.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/source/specification.rst b/docs/source/specification.rst
index 3d870ef..e46782e 100644
--- a/docs/source/specification.rst
+++ b/docs/source/specification.rst
@@ -182,3 +182,4 @@ To support running in parallel with the legacy torflow_, 
**XXX Explain scaling**
 .. _torflow: https://gitweb.torproject.org/torflow.git
 .. _stem: https://stem.torproject.org
 .. _requests: https://docs.python-requests.org/
+.. _peerflow: 
https://www.nrl.navy.mil/itd/chacs/sites/www.nrl.navy.mil.itd.chacs/files/pdfs/16-1231-4353.pdf
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add bandwidth-file-spec in see also

2018-09-25 Thread juga
commit 9a7989d7a647c211d678f71f998fb35260e4197e
Author: juga0 
Date:   Fri Sep 14 17:54:42 2018 +

Add  bandwidth-file-spec in see also
---
 docs/source/man_sbws.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst
index 9d4b164..9636698 100644
--- a/docs/source/man_sbws.rst
+++ b/docs/source/man_sbws.rst
@@ -87,7 +87,8 @@ $XDG_RUNTIME_DIR/sbws
 SEE ALSO
 -
 
-**sbws.ini** (5), https://sbws.readthedocs.org.
+**sbws.ini** (5), https://sbws.readthedocs.org,
+https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt.
 
 BUGS
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Rephrase, add links, remove :term:

2018-09-25 Thread juga
commit d4141d87813d9138e31588caab8a2f5d44ed7e46
Author: juga0 
Date:   Tue Sep 18 15:02:11 2018 +

Rephrase, add links, remove :term:
---
 DEPLOY.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index bbf40f0..6789db4 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -8,7 +8,7 @@ To run sbws is needed:
 - A machine to run the :term:`scanner`.
 - One or more :term:`destination` (s) that serve a large file.
 
-Both the ``scanner`` and your the ``destination``(s) should be on fast,
+Both the ``scanner`` and your the ``destination`` (s) should be on fast,
 well connected machines.
 
 .. _destinations_requirements:
@@ -32,5 +32,5 @@ To configure destinations, create a configuration file 
according to
 ``./docs/source/man_sbws.ini.rst`` (or `/docs/source/man_sbws.ini.rst 
`_
 or :doc:`man_sbws.ini` or ``man sbws.ini``)
 
-See also ``/docs/source/man_sbws.rst`` (or `/docs/source/man_sbws.rst`_ or
+See also ``./docs/source/man_sbws.rst`` (or `/docs/source/man_sbws.rst 
`_ or
 :doc:`man_sbws` or ``man sbws``) manual page.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Leave default sphinx message

2018-09-25 Thread juga
commit 1a33a1ba4da03ff0c65dbc8315f154ddd6d94988
Author: juga0 
Date:   Mon Sep 17 14:13:41 2018 +

Leave default sphinx message
---
 docs/source/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 68942da..098268d 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,6 +1,5 @@
 .. simple-bw-scanner documentation master file, created by
sphinx-quickstart on Fri Mar 23 16:20:02 2018.
-   and modified slightly since thing.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add section about bug reports and trac

2018-09-25 Thread juga
commit 7663f8fb8c2c348312ece375c948c76d6894b70d
Author: juga0 
Date:   Fri Sep 14 18:30:39 2018 +

Add section about bug reports and trac
---
 CONTRIBUTING.rst | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index a2134e0..d7e2822 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -5,9 +5,18 @@ Thank you for your interest in Simple Bandwidth Scanner 
(``sbws``).
 
 Examples of contributions include:
 
-* Bug reports
+* Bug reports, feature requests
 * Code/documentation patches
 
+Bug reports
+
+
+Check that bug has not been already reported.
+To report bugs or request features, open a ticket in
+`Tor Project Trac `_
+and assign the component to ``Core Tor``/``sbws``.
+
+
 Pull requests are welcome, especially if they address open issues.
 
 #. Fork the repo on GitHub



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove section already included in sbws.ini

2018-09-25 Thread juga
commit f276fffa19e11e32c9d94fd7c8465b605ec6d537
Author: juga0 
Date:   Tue Sep 18 09:39:21 2018 +

Remove section already included in sbws.ini
---
 docs/source/config.rst | 14 --
 1 file changed, 14 deletions(-)

diff --git a/docs/source/config.rst b/docs/source/config.rst
index 2a0c7f9..0c80ad3 100644
--- a/docs/source/config.rst
+++ b/docs/source/config.rst
@@ -1,20 +1,6 @@
 Simple Bandwidth Scanner Configuration Files
 
 
-How to create user customized configuration files
---
-``sbws`` use internal configuration files.
-These are **not** intented to be modified by a user.
-If a user needs a customized configuration file, the user needs to create it.
-There's an example configuration file with the minimum data that a user
-probably needs to edit in ``examples``. For more advanced configuration 
options see
-documentation below.
-``sbws`` will check by default whether there's a user customized file in
-``~/.sbws.ini`` and use it when it exists.
-The user can store a customized configuration file anywhere else in the file
-system and and provide ``sbws`` with the path to it via the ``-c`` or
-``--config`` cli option.
-
 How sbws configuration works internally
 
 Sbws has two default config files it reads: on general, and one specific to



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Add reference to sbws man page

2018-09-25 Thread juga
commit 09065ea745a3073bd56476e9b843d2f24a91fd93
Author: juga0 
Date:   Fri Sep 14 18:11:54 2018 +

Add reference to sbws man page
---
 DEPLOY.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 1e56924..8d4a9ce 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -32,3 +32,5 @@ They are not included by default.
 
 To configure destinations, create a configuration file according to
 :doc:`man_sbws.ini`
+
+See also :doc:`sbws.ini` manual page.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Move testing docs to testing file

2018-09-25 Thread juga
commit b132f8c1897413e23d341817397d7bb0248e4034
Author: juga0 
Date:   Fri Sep 14 18:47:20 2018 +

Move testing docs to testing file
---
 INSTALL.rst | 19 ---
 TESTING.rst | 19 +++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 9d5c8f5..5832f3b 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -48,25 +48,6 @@ Install the python dependencies::
 ``sbws`` needs :term:`destination` s to request files from.
 Please, see :ref:`deploy` to know how to configure, deploy and run ``sbws``.
 
-Installing tests dependencies and running them
-
-
-To run the tests, extra Python depenencies are needed:
-
-- Flake8_
-- tox_
-- pytest_
-- coverage_
-
-To install them from ``sbws`` ::
-
-pip install .[dev] && pip install .[test]
-
-To run the tests::
-
-tox
-
-
 Installing documentation dependendencies and building it
 -
 
diff --git a/TESTING.rst b/TESTING.rst
new file mode 100644
index 000..a75aeaa
--- /dev/null
+++ b/TESTING.rst
@@ -0,0 +1,19 @@
+.. _testing:
+
+Installing tests dependencies and running tests
+==
+
+To run the tests, extra Python depenencies are needed:
+
+- Flake8_
+- tox_
+- pytest_
+- coverage_
+
+To install them from ``sbws`` ::
+
+pip install .[dev] && pip install .[test]
+
+To run the tests::
+
+tox



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove license note, it is in README

2018-09-25 Thread juga
commit b46ab1b89d56d9938e28472286a78e34da204202
Author: juga0 
Date:   Fri Sep 14 18:14:31 2018 +

Remove license note, it is in README
---
 CONTRIBUTING.rst | 6 --
 1 file changed, 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2b70c13..560f8b7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -3,12 +3,6 @@ Contributing to Simple Bandwidth Scanner
 
 Thank you for your interest in Simple Bandwidth Scanner (sbws).
 
-.. note::
-
-Simple Bandwidth Scanner is in the public domain according to its
-:doc:`CC0 license `. No one has copyright over sbws, though we
-update the list of :doc:`authors ` from time to time.
-
 
 Pull requests are welcome, especially if they address open issues.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Change doc name to match repo/package

2018-09-25 Thread juga
commit aab743cd3f41ebe68e56689514427fe29d3c099c
Author: juga0 
Date:   Fri Sep 14 18:01:25 2018 +

Change doc name to match repo/package
---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 304c6a6..aa8ffca 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -23,7 +23,7 @@ def find_version():
 
 # -- Project information -
 
-project = 'Simple Bandwidth Scanner'
+project = 'sbws'
 copyright = 'CC0'
 author = 'Matt Traudt [sirmatt at ksu dot edu], juga [juga at riseup dot net]'
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Use same license as setup.py

2018-09-25 Thread juga
commit 89d9cca0e429d70e5ec41785a4bb8d5a8db27d1f
Author: juga0 
Date:   Fri Sep 14 17:57:42 2018 +

Use same license as setup.py
---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index d65a209..304c6a6 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -24,7 +24,7 @@ def find_version():
 # -- Project information -
 
 project = 'Simple Bandwidth Scanner'
-copyright = 'Public Domain'
+copyright = 'CC0'
 author = 'Matt Traudt [sirmatt at ksu dot edu], juga [juga at riseup dot net]'
 
 # The short X.Y version



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove section about config.ini

2018-09-25 Thread juga
commit b3d0e1c9490726a4fb6739215e2f6a4528036090
Author: juga0 
Date:   Sat Sep 8 14:12:21 2018 +

Remove section about config.ini

since it is not anymore used
---
 CONTRIBUTING.rst | 6 --
 1 file changed, 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8336add..2b70c13 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -62,12 +62,6 @@ example, open an extra file into the past just in case it 
happens to include
 result lines that have timestamps that are still considered valid (of course,
 ignore results in the file that are no longer valid).
 
-**Strongly prefer putting new config options in ``sbws/config.default.ini``**
-instead of ``sbws/config.example.ini``. The former holds default values for
-approxmiately all sbws configuration options and can be changed with an sbws
-update. The latter is used as a starting point for generating a client's
-``config.ini`` and changes to it only affect newly generated config files.
-
 **Document your addition, fix, change, or whatever in the changelog**. See
 `keep a changelog`_ for the standard we follow. Of note, add Added, Changed,
 Deprecated, Removed, Fixed, and Security headings as needed in the Unreleased



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [sbws/master] Remove info about .sbws since it is in the man

2018-09-25 Thread juga
commit f61fed2f84a49dde4c7d7db7406b56955bc8dce5
Author: juga0 
Date:   Fri Sep 14 17:09:07 2018 +

Remove info about .sbws since it is in the man

and it is linked from INSTALL
---
 README.md | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/README.md b/README.md
index f5b98a3..19c96cc 100644
--- a/README.md
+++ b/README.md
@@ -39,18 +39,3 @@ also online at https://sbws.readthedocs.io and
 - `tests/unit/` simple little tests that don't require Tor to be running
 - `tests/integration/` more complex tests and/or tests that require Tor to be 
running
 - `tests/testnets/` scripts and code for running mini Tor networks locally
-
-## The `.sbws` directory
-
-By default is `~/.sbws`.
-
-In this directory you will find
-
-- `datadir/` Once your sbws scanner has started gathering results, it will dump
-  them into this directory. Other sbws commands (such as generate and stats)
-  read results from the files in this directory.
-- `log/` If configured, this directory stores logs generated by all the sbws
-  commands in rotating log files.
-- `v3bw/` This directory stores the v3bw files created with `sbws generate`.
-- `state.dat` A file for storing state needed between sbws commands. See its
-  documentation for more information.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


  1   2   >