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

2018-11-21 Thread translation
commit ddba33a287a8881159e155b9168d061ca45fb636
Author: Translation commit bot 
Date:   Thu Nov 22 05:49:00 2018 +

Update translations for whisperback
---
 sv/sv.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index c34bd0829..878889ae8 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-11-21 16:28+\n"
+"PO-Revision-Date: 2018-11-22 05:26+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
-msgstr "Ogiltig e-postadress: %s"
+msgstr "Ogiltig kontakt e-post: %s"
 
 #: ../whisperBack/whisperback.py:74
 #, python-format
@@ -36,7 +36,7 @@ msgstr "Ogiltig kontakt OpenPGP-nyckel: %s"
 
 #: ../whisperBack/whisperback.py:76
 msgid "Invalid contact OpenPGP public key block"
-msgstr "Ogiltig OpenPGP publikt nyckel block"
+msgstr "Ogiltig OpenPGP publikt nyckelblock"
 
 #: ../whisperBack/exceptions.py:41
 #, python-format
@@ -63,7 +63,7 @@ msgstr "Önskat resultat"
 
 #: ../whisperBack/gui.py:130
 msgid "Unable to load a valid configuration."
-msgstr "Kunde inte läsa in en korrekt konfiguration."
+msgstr "Kunde inte läsa in en giltig konfiguration."
 
 #: ../whisperBack/gui.py:166
 msgid "Sending mail..."
@@ -84,15 +84,15 @@ msgstr "Kontaktens e-postadress verkar inte giltig."
 
 #: ../whisperBack/gui.py:202
 msgid "Unable to send the mail: SMTP error."
-msgstr "Kunde inte skicka e-post: SMTP fel."
+msgstr "Det gick inte att skicka e-post: SMTP-fel."
 
 #: ../whisperBack/gui.py:204
 msgid "Unable to connect to the server."
-msgstr "Kunde inte koppla upp till servern."
+msgstr "Det gick inte att ansluta till servern."
 
 #: ../whisperBack/gui.py:206
 msgid "Unable to create or to send the mail."
-msgstr "Kunde inte skapa eller skicka e-postmeddelandet."
+msgstr "Det går inte att skapa eller skicka e-post."
 
 #: ../whisperBack/gui.py:209
 msgid ""

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


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

2018-11-21 Thread translation
commit a885242c64eb82c2029229ea83fd591e52d8e864
Author: Translation commit bot 
Date:   Thu Nov 22 05:48:36 2018 +

Update translations for torcheck
---
 sv/torcheck.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 3755ab3b9..fe4d3b16d 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-11-21 16:34+\n"
+"PO-Revision-Date: 2018-11-22 05:23+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ 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 "Besök https://www.torproject.org/\;>Tor-webbplatsen 
för mer information om hur du använder Tor säkert.  Du kan nu surfa på 
nätet anonymt."
+msgstr "Vänligen besök https://www.torproject.org/\;>Tor-webbplatsen för mer information 
om hur du använder Tor på ett säkert sätt. Du kan nu surfa på nätet 
anonymt."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Det finns en tillgänglig säkerhets uppdatering för Tor Browser."
@@ -42,7 +42,7 @@ msgstr "Det finns en tillgänglig säkerhets uppdatering för 
Tor Browser."
 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\;>Klicka här 
för att gå till nedladdningssidan"
+msgstr "https://www.torproject.org/download/download-easy.html\;>Klicka här 
för att gå till hämtningssidan"
 
 msgid "Sorry. You are not using Tor."
 msgstr "Tyvärr. Du använder inte Tor."
@@ -60,7 +60,7 @@ msgstr "Tyvärr, antingen misslyckades din förfrågan eller 
så inkom ett ovän
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
 "address is a https://www.torproject.org/\;>Tor node."
-msgstr "Ett temporärt fel på tjänsten förhindrar oss från att avgöra om 
den IP-adress din trafik kommer ifrån är en https://www.torproject.org/\;>Tor-nod."
+msgstr "En tillfällig serviceavbrott  förhindrar oss från att avgöra om 
den IP-adress din trafik kommer ifrån är en https://www.torproject.org/\;>Tor-nod."
 
 msgid "Your IP address appears to be: "
 msgstr "Din IP-adress ser ut att vara:"

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit 02f000790892de6d75f1d3e5b2ecbc75c014d96a
Author: Translation commit bot 
Date:   Wed Nov 21 23:46:54 2018 +

Update translations for tbmanual-contentspot
---
 contents+el.po | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 931da6e07..6381e167e 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -86,6 +86,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Από προεπιλογή, ο Tor Browser δεν κρατά κανένα 
ιστορικό περιήγησης. Τα "
+"cookies είναι έγκυρα μόνο για μια συνεδρία 
(μέχρι να κλείσει ο Tor Browser ή"
+" να ζητηθεί μια Νέα "
+"Ταυτότητα)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -174,7 +178,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# Mirrors"
-msgstr ""
+msgstr "# Mirrors"
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -184,6 +188,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
+"Αν δεν μπορείτε να κατεβάσετε το Tor Browser 
από τον επίσημο ιστότοπο του "
+"Tor Project, μπορείτε να δοκιμάσετε να το 
κατεβάσετε από έναν από τα επίσημα"
+" mirror μας είτε μέσω του [EFF] (https://tor.eff.org) ή του 
[Calyx "
+"Institute] (https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -393,7 +401,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
 msgid "running-tor-browser"
-msgstr ""
+msgstr "running-tor-browser"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.title)
@@ -504,6 +512,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -1836,7 +1846,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/plugins/
 #: (content/plugins/contents+en-US.lrtopic.seo_slug)
 msgid "plugins"
-msgstr ""
+msgstr "πρόσθετα"
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.title)
@@ -1956,7 +1966,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.seo_slug)
 msgid "troubleshooting"
-msgstr ""
+msgstr "αντιμετώπιση προβλημάτων"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.title)
@@ -2068,7 +2078,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/contents+en-US.lrtopic.seo_slug)
 msgid "uninstalling"
-msgstr ""
+msgstr "απεγκατάσταση"
 
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/contents+en-US.lrtopic.title)

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


[tor-commits] [stem/master] Descriptor decompression inappropriately stripped trailing newline

2018-11-21 Thread atagar
commit 32a3d26267b24bc441f81ad3559d2acc318eb125
Author: Damian Johnson 
Date:   Wed Nov 21 15:28:36 2018 -0800

Descriptor decompression inappropriately stripped trailing newline

Oops, our decompression helper stripped trailing whitespaces. This wasn't
noticeable to our parser, but it does throw off digesting...

  import stem.descriptor.remote

  digest = 'BsaDvyZyHjBDGWCYpMx0Du3N1Mn2uMfNF7PjgizQC1s'

  desc = stem.descriptor.remote.get_microdescriptors([digest]).run()[0]
  print('digest: %s (expected %s)' % (desc.digest(), digest))

  

  % python scrap.py
  digest: j8kC3P07m9dL45ll1O0PSpvfOfxLtzAWqJYjzvwLEcM (expected 
BsaDvyZyHjBDGWCYpMx0Du3N1Mn2uMfNF7PjgizQC1s)
---
 stem/descriptor/remote.py  | 8 
 test/unit/descriptor/remote.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 78dd8367..b27bb39d 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -948,9 +948,9 @@ def _decompress(data, encoding):
   """
 
   if encoding == Compression.PLAINTEXT:
-return data.strip()
+return data
   elif encoding in (Compression.GZIP, 'deflate'):
-return zlib.decompress(data, zlib.MAX_WBITS | 32).strip()
+return zlib.decompress(data, zlib.MAX_WBITS | 32)
   elif encoding == Compression.ZSTD:
 if not stem.prereq.is_zstd_available():
   raise ImportError('Decompressing zstd data requires 
https://pypi.python.org/pypi/zstandard')
@@ -961,13 +961,13 @@ def _decompress(data, encoding):
 with zstd.ZstdDecompressor().write_to(output_buffer) as decompressor:
   decompressor.write(data)
 
-return output_buffer.getvalue().strip()
+return output_buffer.getvalue()
   elif encoding == Compression.LZMA:
 if not stem.prereq.is_lzma_available():
   raise ImportError('Decompressing lzma data requires 
https://docs.python.org/3/library/lzma.html')
 
 import lzma
-return lzma.decompress(data).strip()
+return lzma.decompress(data)
   else:
 raise ValueError("'%s' isn't a recognized type of encoding" % encoding)
 
diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py
index e6171852..aab5f5d6 100644
--- a/test/unit/descriptor/remote.py
+++ b/test/unit/descriptor/remote.py
@@ -320,7 +320,7 @@ class TestDescriptorDownloader(unittest.TestCase):
 self.assertEqual('moria1', desc.nickname)
 self.assertEqual('128.31.0.34', desc.address)
 self.assertEqual('9695DFC35FFEB861329B9F1AB04C46397020CE31', 
desc.fingerprint)
-self.assertEqual(TEST_DESCRIPTOR.strip(), desc.get_bytes())
+self.assertEqual(TEST_DESCRIPTOR, desc.get_bytes())
 
   @patch(URL_OPEN, _dirport_mock(b'some malformed stuff'))
   def test_query_with_malformed_content(self):

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


[tor-commits] [translation/support-portal] Update translations for support-portal

2018-11-21 Thread translation
commit a7c5670523a834e2eed73e93e6c2f5803f8b4d96
Author: Translation commit bot 
Date:   Wed Nov 21 23:19:11 2018 +

Update translations for support-portal
---
 contents+el.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 1e06a5033..5927edadd 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -4,6 +4,7 @@
 # Sofia K., 2018
 # A Papac , 2018
 # Emma Peel, 2018
+# Elektra M. , 2018
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Elektra M. , 2018\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4413,7 +4414,7 @@ msgstr "Εγγραφείτε στο Newsletter μας"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr ""
+msgstr "Λάβετε μηνιαίες ενημερώσεις και ευ
καιρίες από το Tor Project"
 
 #: templates/footer.html:32
 msgid ""

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit 296edb6d7c1fb700d8d05add43cc59371690c50f
Author: Translation commit bot 
Date:   Wed Nov 21 23:17:00 2018 +

Update translations for tbmanual-contentspot
---
 contents+el.po | 36 +---
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 9f2fc4f33..931da6e07 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2,6 +2,7 @@
 # A Papac , 2018
 # erinm, 2018
 # Emma Peel, 2018
+# Elektra M. , 2018
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Elektra M. , 2018\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -302,7 +303,7 @@ msgstr "# Σύνδεση"
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -332,7 +333,7 @@ msgstr "# Διαμόρφωση "
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -382,12 +383,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
@@ -763,7 +764,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -900,7 +901,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -908,6 +909,9 @@ msgid ""
 "You can see a diagram of the circuit that Tor Browser is using for the "
 "current tab in the site information menu, in the URL bar."
 msgstr ""
+"Μπορείτε να δείτε ένα διάγραμμα του κυ
κλώματος που χρησιμοποιεί το Tor "
+"Browser για την τρέχουσα καρτέλα στο μενού 
πληροφοριών της σελίδας, στη "
+"γραμμή διευθύνσεων URL."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1002,7 +1006,7 @@ msgstr "# Αλλάζοντας ταυτότητες 
και δίκτυα"
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -2171,7 +2175,7 @@ msgstr "Συμπληρώστε τις 
πληροφορίες σας στα πε
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2185,7 +2189,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2221,7 +2225,7 @@ msgstr "* Πατήστε το μπλε σήμα 
\"Μπείτε στην ομάδ
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2234,7 +2238,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: 

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit 600b5a0aac6e92a6072e3719ff968fc60f9aa2a2
Author: Translation commit bot 
Date:   Wed Nov 21 22:45:03 2018 +

Update translations for abouttor-homepage
---
 el/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index b8ef776c4..d93a5a5a6 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 

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


[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Update Torbutton submodule

2018-11-21 Thread gk
commit 9a300eedd12c23e1ce48484816df00f4c1a77033
Author: Georg Koppen 
Date:   Wed Nov 21 22:21:36 2018 +

Update Torbutton submodule
---
 toolkit/torproject/torbutton | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index ac8d92514940..a41034ced7a6 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd
+Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f

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


[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27111: Configure tor browser for mobile to load about:tor

2018-11-21 Thread gk
commit c0c87e1a9a6573ac480e4b46d232a4b451f6475c
Author: Igor Oliveira 
Date:   Thu Nov 15 07:33:54 2018 -0200

Bug 27111: Configure tor browser for mobile to load about:tor

- Add preferences.json: it is used to configure android specific
preferences

- Keep the ActivityStream HomePager closed when the user clicks in the
url bar
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java |  2 --
 mobile/android/torbrowser/assets/distribution/preferences.json | 10 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java 
b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 4a497f6999e0..5efd83398775 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2734,8 +2734,6 @@ public class BrowserApp extends GeckoApp
 
 mBrowserToolbar.startEditing(url, animator);
 
-showHomePagerWithAnimator(panelId, null, animator);
-
 animator.start();
 Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN);
 }
diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json 
b/mobile/android/torbrowser/assets/distribution/preferences.json
new file mode 100644
index ..bebd14967d8e
--- /dev/null
+++ b/mobile/android/torbrowser/assets/distribution/preferences.json
@@ -0,0 +1,10 @@
+{
+  "ApplicationPreferences": {
+"newtab.load_homepage": true
+  },
+  "AndroidPreferences": {
+"homepage": "about:tor",
+"startpane_enabled_after_57": true,
+"startpane_enabled": true
+  }
+}

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


[tor-commits] [torbutton/master] Bug 27111: Update about:tor desktop version to work on mobile

2018-11-21 Thread gk
commit 61deb44d0c07eb1ec1d71eac2f0a7aeca87ea054
Author: Igor Oliveira 
Date:   Wed Aug 29 07:31:26 2018 -0300

Bug 27111: Update about:tor desktop version to work on mobile

Update torbutton, aboutTor(markup and styling) to work on mobile.
---
 src/chrome/content/aboutTor/aboutTor-content.js |   3 ++
 src/chrome/content/aboutTor/aboutTor.xhtml  |   2 ++
 src/chrome/content/torbutton.js |  23 +++
 src/chrome/skin/aboutTor.css|  36 
 src/chrome/skin/torbrowser_mobile_logo.png  | Bin 0 -> 9345 bytes
 5 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor-content.js 
b/src/chrome/content/aboutTor/aboutTor-content.js
index e8f5ffa2..d34bbe5c 100644
--- a/src/chrome/content/aboutTor/aboutTor-content.js
+++ b/src/chrome/content/aboutTor/aboutTor-content.js
@@ -119,6 +119,9 @@ var AboutTorListener = {
 else
   body.removeAttribute("showmanual");
 
+if (aData.mobile)
+  body.setAttribute("mobile", "yes");
+
 // Setting body.initialized="yes" displays the body.
 body.setAttribute("initialized", "yes");
   },
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 9256748e..94dd13f3 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -18,6 +18,7 @@
 
 http://www.w3.org/1999/xhtml;>
 
+  
   
   
@@ -73,6 +74,7 @@ window.addEventListener("pageshow", function() {
 
   
   
+
 
   
 
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 90da5827..ee13f461 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -238,6 +238,10 @@ function torbutton_donation_banner_countdown() {
   }
 }
 
+function torbutton_is_mobile() {
+return Services.appinfo.OS === "Android";
+}
+
 // Bug 1506 P2-P4: This code sets some version variables that are irrelevant.
 // It does read out some important environment variables, though. It is
 // called once per browser window.. This might belong in a component.
@@ -408,11 +412,19 @@ function torbutton_init() {
 torbutton_update_toolbutton();
 torbutton_notify_if_update_needed();
 
-createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
-m_tb_control_port, m_tb_control_pass,
-"extensions.torbutton.display_circuit");
+try {
+createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
+m_tb_control_port, m_tb_control_pass,
+   "extensions.torbutton.display_circuit");
+} catch(e) {
+torbutton_log(4, "Error creating the tor circuit display " + e);
+}
 
-torbutton_init_user_manual_links();
+try {
+torbutton_init_user_manual_links();
+} catch(e) {
+torbutton_log(4, "Error loading the user manual " + e);
+}
 
 // Arrange for our about:tor content script to be loaded in each frame.
 window.messageManager.loadFrameScript(
@@ -449,6 +461,7 @@ var torbutton_abouttor_message_handler = {
   // not working.
   get chromeData() {
 return {
+  mobile: torbutton_is_mobile(),
   torOn: torbutton_tor_check_ok()
 };
   }
@@ -1932,7 +1945,7 @@ function showSecurityPreferencesPanel(chromeWindow) {
 }
 
 function setupPreferencesForMobile() {
-  if (Services.appinfo.OS !== "Android") {
+  if (!torbutton_is_mobile()) {
 return;
   }
 
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 9f195cfd..60035a24 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -199,6 +199,8 @@ body:not([showmanual]) .showForManual {
   width: 100%;
   max-width: 2200px;/* room for our 20 circles */
   overflow: hidden;
+  position: absolute;
+  bottom: 0px;
 }
 
 .onion-pattern-row {
@@ -395,3 +397,37 @@ body[show-donation-banner="true"] 
#onboarding-overlay-button {
   transition: transform 0ms;
   position: absolute;
 }
+
+/*
+ * Mobile specific css
+ */
+
+.torcontent-logo {
+  display: none;
+}
+
+body[mobile] #torstatus-version,
+body[mobile] .searchbox,
+body[mobile] .top .heading2,
+body[mobile] #bottom {
+  display: none;
+}
+
+body[mobile] .top {
+  white-space: normal;
+  margin-top: 0px !important;
+}
+
+body[mobile] .torcontent-logo {
+  display: block;
+  margin-top: 20px;
+  width: 50%;
+  height: auto;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+body[mobile] .top .heading1 {
+  font-size: 62px;
+  line-height: 1.1
+}
diff --git a/src/chrome/skin/torbrowser_mobile_logo.png 
b/src/chrome/skin/torbrowser_mobile_logo.png
new file mode 100644
index ..9d8317f0
Binary files /dev/null and b/src/chrome/skin/torbrowser_mobile_logo.png differ



___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [torbutton/master] Bug 28093: Update donation banner style to make it fit in small screens

2018-11-21 Thread gk
commit a41034ced7a6c0fe590320d9da61d15df1fef42f
Author: Igor Oliveira 
Date:   Tue Nov 20 11:15:03 2018 -0200

Bug 28093: Update donation banner style to make it fit in small screens
---
 src/chrome/skin/aboutTor.css | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 60035a24..cf8290c9 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -431,3 +431,30 @@ body[mobile] .top .heading1 {
   font-size: 62px;
   line-height: 1.1
 }
+
+body[mobile] #donation-banner {
+  position: static;
+}
+
+body[mobile][show-donation-banner="true"] .torcontent-container,
+body[mobile][show-donation-banner="true"] .onion-pattern-container {
+  transform: none;
+}
+
+body[mobile][show-donation-banner="false"] .torcontent-container {
+  transform: translateY(-200px);
+}
+
+@media only screen and (max-width: 480px) {
+  #donation-banner-image {
+display: none;
+  }
+
+  #donation-banner-lines {
+align-items: stretch;
+  }
+
+  #donation-banner-button {
+text-align: center;
+  }
+}

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit a73cee8175ad2c4480c253162f95d1bfebb7c4c8
Author: Translation commit bot 
Date:   Wed Nov 21 22:15:03 2018 +

Update translations for abouttor-homepage
---
 el/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index cf999f4c8..b8ef776c4 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -35,9 +35,9 @@
 
 
 
-
+
 
-
+
 
 
 

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


[tor-commits] [stem/master] Undeprecate stem.descriptor.remote's get_microdescriptors()

2018-11-21 Thread atagar
commit c606f44289408a63ea9ddfbe4dc3a18384b350cd
Author: Damian Johnson 
Date:   Wed Nov 21 11:52:50 2018 -0800

Undeprecate stem.descriptor.remote's get_microdescriptors()

We deprecated get_microdescriptors() because tor hadn't implemented it on
DirPorts but now it has. Not only that but our existing method just works
(neat!). Undeprecating get_microdescriptors(), expanding its pydocs, adding
a test, and adding an alias to the base module to match other descriptor
types.
---
 docs/change_log.rst   |  1 +
 stem/descriptor/remote.py | 46 --
 test/unit/doctest.py  | 30 ++
 3 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 7b99f8f0..396ec105 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -51,6 +51,7 @@ The following are only available within Stem's `git repository
 
  * **Descriptors**
 
+  * Added :func:`stem.descriptor.remote.get_microdescriptors`
   * Added :func:`~stem.descriptor.__init__.Descriptor.from_str` method 
(:trac:`28450`)
   * Added :func:`~stem.descriptor.__init__.Descriptor.type_annotation` method 
(:trac:`28397`)
   * Added the **hash_type** and **encoding** arguments to `ServerDescriptor 
`_
 and `ExtraInfo's 
`_
 digest methods (:trac:`28398`)
diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 91a3bad2..78dd8367 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -59,6 +59,7 @@ content. For example...
 |- their_server_descriptor - provides the server descriptor of the relay 
we download from
 |- get_server_descriptors - provides present server descriptors
 |- get_extrainfo_descriptors - provides present extrainfo descriptors
+|- get_microdescriptors - provides present microdescriptors with the given 
digests
 |- get_consensus - provides the present consensus or router status entries
 |- get_key_certificates - provides present authority key certificates
 +- query - request an arbitrary descriptor resource
@@ -191,6 +192,18 @@ def get_extrainfo_descriptors(fingerprints = None, 
**query_args):
   return get_instance().get_extrainfo_descriptors(fingerprints, **query_args)
 
 
+def get_microdescriptors(hashes, **query_args):
+  """
+  Shorthand for
+  :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors`
+  on our singleton instance.
+
+  .. versionadded:: 1.8.0
+  """
+
+  return get_instance().get_microdescriptors(hashes, **query_args)
+
+
 def get_consensus(authority_v3ident = None, microdescriptor = False, 
**query_args):
   """
   Shorthand for
@@ -662,19 +675,32 @@ class DescriptorDownloader(object):
 
 return self.query(resource, **query_args)
 
-  # TODO: drop in stem 2.x
-
   def get_microdescriptors(self, hashes, **query_args):
 """
 Provides the microdescriptors with the given hashes. To get these see the
-'microdescriptor_hashes' attribute of
-:class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3`. Note
-that these are only provided via a microdescriptor consensus (such as
-'cached-microdesc-consensus' in your data directory).
-
-.. deprecated:: 1.5.0
-   This function has never worked, as it was never implemented in tor
-   (:trac:`9271`).
+**microdescriptor_digest** attribute of
+:class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3`.
+Note that these are only provided via the **microdescriptor consensus**.
+For exampe...
+
+::
+
+  >>> import stem.descriptor.remote
+  >>> consensus = stem.descriptor.remote.get_consensus(microdescriptor = 
True).run()
+  >>> my_router_status_entry = filter(lambda desc: desc.nickname == 
'caersidi', consensus)[0]
+  >>> print(my_router_status_entry.microdescriptor_digest)
+  IQI5X2A5p0WVN/MgwncqOaHF2f0HEGFEaxSON+uKRhU
+
+  >>> my_microdescriptor = 
stem.descriptor.remote.get_microdescriptors([my_router_status_entry.microdescriptor_digest]).run()[0]
+  >>> print(my_microdescriptor)
+  onion-key
+  -BEGIN RSA PUBLIC KEY-
+  MIGJAoGBAOJo9yyVgG8ksEHQibqPIEbLieI6rh1EACRPiDiV21YObb+9QEHaR3Cf
+  FNAzDbGhbvADLBB7EzuViL8w+eXQUOaIsJRdymh/wuUJ78bv5oEIJhthKq/Uqa4P
+  wKHXSZixwAHfy8NASTX3kxu9dAHWU3Owb+4W4lR2hYM0ZpoYYkThAgMBAAE=
+  -END RSA PUBLIC KEY-
+  ntor-onion-key kWOHNd+2uBlMpcIUbbpFLiq/rry66Ep6MlwmNpwzcBg=
+  id ed25519 xE/GeYImYAIB0RbzJXFL8kDLpDrj/ydCuCdvOgC4F/4
 
 :param str,list hashes: microdescriptor hash or list of hashes to be
   retrieved
diff --git a/test/unit/doctest.py b/test/unit/doctest.py
index 7e40e873..28eef0cf 100644
--- a/test/unit/doctest.py
+++ b/test/unit/doctest.py
@@ -34,6 +34,26 @@ ADD_ONION_RESPONSE = """\
 250 OK
 """
 
+CONSENSUS_ENTRY = """\
+r caersidi O7NMYwctnRDoNu5ClocT97kyX2Y 2018-11-21 05:25:24 208.113.135.162 
1443 1444
+m IQI5X2A5p0WVN/MgwncqOaHF2f0HEGFEaxSON+uKRhU
+s Fast 

[tor-commits] [stem/master] Replace microdescriptor router status entry digest attribute

2018-11-21 Thread atagar
commit e30b130482be258245a4a28774959ecb2def58ed
Author: Damian Johnson 
Date:   Wed Nov 21 10:42:20 2018 -0800

Replace microdescriptor router status entry digest attribute

Bah. Back when I added our 'digest' attribute to RouterStatusEntryMicroV3 I
tried to be consistent by making all our hashes hex. However, this was a
mistake. Uses of the microdescriptor digest expect base64 so deprecating the
'digest' attribute with another 'microdescriptor_digest' that's base64.
---
 docs/change_log.rst |  1 +
 stem/descriptor/router_status_entry.py  | 12 +++-
 test/unit/descriptor/router_status_entry.py |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index e99e933f..7b99f8f0 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -56,6 +56,7 @@ The following are only available within Stem's `git repository
   * Added the **hash_type** and **encoding** arguments to `ServerDescriptor 
`_
 and `ExtraInfo's 
`_
 digest methods (:trac:`28398`)
   * Added the network status vote's new bandwidth_file_digest attribute 
(:spec:`1b686ef`)
   * Added 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods 
(:trac:`28448`)
+  * Replaced 
:func:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` hex 
encoded **digest** attribute with a base64 encoded **microdescriptor_digest**
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
 
diff --git a/stem/descriptor/router_status_entry.py 
b/stem/descriptor/router_status_entry.py
index b4cd506a..7e88c89a 100644
--- a/stem/descriptor/router_status_entry.py
+++ b/stem/descriptor/router_status_entry.py
@@ -342,6 +342,10 @@ def _parse_microdescriptor_m_line(descriptor, entries):
   # "m" digest
   # example: m aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70
 
+  descriptor.microdescriptor_digest = _value('m', entries)
+
+  # TODO: drop the following in stem 2.x
+
   descriptor.digest = _base64_to_hex(_value('m', entries), 
check_if_fingerprint = False)
 
 
@@ -672,7 +676,9 @@ class RouterStatusEntryMicroV3(RouterStatusEntry):
 information that isn't yet recognized
   :var dict protocols: mapping of protocols to their supported versions
 
-  :var str digest: **\*** router's hex encoded digest of our corresponding 
microdescriptor
+  :var str digest: **\*** router's hex encoded digest of our corresponding
+microdescriptor (**deprecated**, use microdescriptor_digest instead)
+  :var str microdescriptor_digest: **\*** router's base64 encoded digest of 
our corresponding microdescriptor
 
   .. versionchanged:: 1.6.0
  Added the protocols attribute.
@@ -680,6 +686,9 @@ class RouterStatusEntryMicroV3(RouterStatusEntry):
   .. versionchanged:: 1.7.0
  Added the or_addresses attribute.
 
+  .. versionchanged:: 1.7.0
+ Added the microdescriptor_digest attribute to replace our now deprecated 
digest attribute.
+
   **\*** attribute is either required when we're parsed with validation or has
   a default value, others are left as **None** if undefined
   """
@@ -692,6 +701,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry):
 'unrecognized_bandwidth_entries': ([], _parse_w_line),
 'protocols': ({}, _parse_pr_line),
 
+'microdescriptor_digest': (None, _parse_microdescriptor_m_line),
 'digest': (None, _parse_microdescriptor_m_line),
   })
 
diff --git a/test/unit/descriptor/router_status_entry.py 
b/test/unit/descriptor/router_status_entry.py
index 9d8bf8ac..05b4dee6 100644
--- a/test/unit/descriptor/router_status_entry.py
+++ b/test/unit/descriptor/router_status_entry.py
@@ -163,6 +163,7 @@ class TestRouterStatusEntry(unittest.TestCase):
 self.assertEqual(expected_flags, set(entry.flags))
 self.assertEqual(None, entry.version_line)
 self.assertEqual(None, entry.version)
+self.assertEqual('aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70', 
entry.microdescriptor_digest)
 
self.assertEqual('6A252497006BB9AF36A1B1B902C4D7FA2129923400DBE0101F167B1B031F63BD',
 entry.digest)
 self.assertEqual([], entry.get_unrecognized_lines())
 



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


[tor-commits] [stem/master] Digest method for microdescriptors

2018-11-21 Thread atagar
commit 5495c5725ed492055fe888f6269ab062baa52e38
Author: Damian Johnson 
Date:   Wed Nov 21 12:21:32 2018 -0800

Digest method for microdescriptors

Revamp digesting of Microdescriptors in the same way as server and extrainfo
descriptors...

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

This is definitely better *but* is backward incompatible with the class' old
'digest' attribute. Unfortunately I can't avoid this. The method needs to be
called digest() for consistency, and python cannot have name conflicts 
between
methods and attributes.

The old digest value was hex rather than base64 encoded which made it
relatively useless (it couldn't be used to fetch or validate 
microdescriptors,
the sole point of the damn thing) so fingers crossed that no one was using 
it.

I try very hard to provide backward compatibility in minor version bumps of
Stem but in this case I don't think we should be a slave to that here.
---
 docs/change_log.rst |  1 +
 stem/descriptor/microdescriptor.py  | 42 ++---
 test/unit/descriptor/microdescriptor.py |  1 +
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 396ec105..48311df4 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -58,6 +58,7 @@ The following are only available within Stem's `git repository
   * Added the network status vote's new bandwidth_file_digest attribute 
(:spec:`1b686ef`)
   * Added 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods 
(:trac:`28448`)
   * Replaced 
:func:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` hex 
encoded **digest** attribute with a base64 encoded **microdescriptor_digest**
+  * Replaced the **digest** attribute of 
:class:`~stem.descriptor.microdescriptor.Microdescriptor` with a method by the 
same name (:trac:`28398`)
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
 
diff --git a/stem/descriptor/microdescriptor.py 
b/stem/descriptor/microdescriptor.py
index 74a01071..8672f039 100644
--- a/stem/descriptor/microdescriptor.py
+++ b/stem/descriptor/microdescriptor.py
@@ -71,6 +71,8 @@ import stem.prereq
 
 from stem.descriptor import (
   Descriptor,
+  DigestHash,
+  DigestEncoding,
   _descriptor_content,
   _descriptor_components,
   _read_until_keywords,
@@ -183,10 +185,6 @@ def _parse_id_line(descriptor, entries):
   descriptor.identifiers = identities
 
 
-def _parse_digest(descriptor, entries):
-  setattr(descriptor, 'digest', 
hashlib.sha256(descriptor.get_bytes()).hexdigest().upper())
-
-
 _parse_onion_key_line = _parse_key_block('onion-key', 'onion_key', 'RSA PUBLIC 
KEY')
 _parse_ntor_onion_key_line = _parse_simple_line('ntor-onion-key', 
'ntor_onion_key')
 _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: 
v.split(' '))
@@ -199,9 +197,6 @@ class Microdescriptor(Descriptor):
   Microdescriptor (`descriptor specification
   `_)
 
-  :var str digest: **\*** hex digest for this microdescriptor, this can be used
-to match against the corresponding digest attribute of a
-:class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3`
   :var str onion_key: **\*** key used to encrypt EXTEND cells
   :var str ntor_onion_key: base64 key used to encrypt EXTEND in the ntor 
protocol
   :var list or_addresses: **\*** alternative for our address/or_port 
attributes, each
@@ -231,6 +226,13 @@ class Microdescriptor(Descriptor):
 
   .. versionchanged:: 1.6.0
  Added the protocols attribute.
+
+  .. versionchanged:: 1.8.0
+ Replaced our **digest** attribute with a much more flexible **digest()**
+ method. Unfortunately I cannot do this in a backward compatible way
+ because of the name conflict. The old digest had multiple problems (for
+ instance, being hex rather than base64 encoded), so hopefully no one was
+ using it. Very sorry if this causes trouble for anyone.
   """
 
   TYPE_ANNOTATION_NAME = 'microdescriptor'
@@ -246,7 +248,6 @@ class Microdescriptor(Descriptor):
 'identifier': (None, _parse_id_line),  # deprecated in favor of identifiers
 'identifiers': ({}, _parse_id_line),
 'protocols': ({}, _parse_pr_line),
-'digest': (None, _parse_digest),
   }
 
   PARSER_FOR_LINE = {
@@ -275,12 +276,35 @@ class Microdescriptor(Descriptor):
 entries = _descriptor_components(raw_contents, validate)
 
 if validate:
-  self.digest = hashlib.sha256(self.get_bytes()).hexdigest().upper()
   self._parse(entries, validate)
   self._check_constraints(entries)
 else:
   self._entries = entries
 
+  def digest(self, hash_type = DigestHash.SHA256, encoding 

[tor-commits] [stem/master] Implement RouterStatusEntry.from_str()

2018-11-21 Thread atagar
commit 310b5ca40b24231a0721117cfb35952b9035dcde
Author: Damian Johnson 
Date:   Wed Nov 21 11:36:07 2018 -0800

Implement RouterStatusEntry.from_str()

Router status entries don't have their own @type annotation, so our 
from_str()
method could not provide them. Implementing their own from_str() method so
things like RouterStatusEntryV3.from_str() will work.
---
 stem/descriptor/router_status_entry.py  | 22 ++
 test/unit/descriptor/router_status_entry.py | 14 ++
 2 files changed, 36 insertions(+)

diff --git a/stem/descriptor/router_status_entry.py 
b/stem/descriptor/router_status_entry.py
index 7e88c89a..b3334620 100644
--- a/stem/descriptor/router_status_entry.py
+++ b/stem/descriptor/router_status_entry.py
@@ -21,6 +21,7 @@ sources...
 
 import base64
 import binascii
+import io
 
 import stem.exit_policy
 import stem.prereq
@@ -428,6 +429,27 @@ class RouterStatusEntry(Descriptor):
 'v': _parse_v_line,
   }
 
+  @classmethod
+  def from_str(cls, content, **kwargs):
+# Router status entries don't have their own @type annotation, so to make
+# our subclass from_str() work we need to do the type inferencing ourself.
+
+if cls == RouterStatusEntry:
+  raise NotImplementedError('Please use the from_str() method from 
RouterStatusEntry subclasses, not RouterStatusEntry itself')
+elif 'descriptor_type' in kwargs:
+  raise ValueError("Router status entries don't have their own @type 
annotation. As such providing a 'descriptor_type' argument with 
RouterStatusEntry.from_str() does not work. Please drop the 'descriptor_type' 
argument when using this these subclasses' from_str() method.")
+
+is_multiple = kwargs.pop('multiple', False)
+validate = kwargs.pop('validate', False)
+results = 
list(_parse_file(io.BytesIO(stem.util.str_tools._to_bytes(content)), validate, 
cls, **kwargs))
+
+if is_multiple:
+  return results
+elif len(results) == 1:
+  return results[0]
+else:
+  raise ValueError("Descriptor.from_str() expected a single descriptor, 
but had %i instead. Please include 'multiple = True' if you want a list of 
results instead." % len(results))
+
   def __init__(self, content, validate = False, document = None):
 """
 Parse a router descriptor in a network status document.
diff --git a/test/unit/descriptor/router_status_entry.py 
b/test/unit/descriptor/router_status_entry.py
index 05b4dee6..c428d6b2 100644
--- a/test/unit/descriptor/router_status_entry.py
+++ b/test/unit/descriptor/router_status_entry.py
@@ -20,6 +20,7 @@ from test.unit.descriptor import (
 )
 
 from stem.descriptor.router_status_entry import (
+  RouterStatusEntry,
   RouterStatusEntryV2,
   RouterStatusEntryV3,
   RouterStatusEntryMicroV3,
@@ -83,6 +84,19 @@ def vote_document():
 
 
 class TestRouterStatusEntry(unittest.TestCase):
+  def test_from_str(self):
+"""
+Exercise our RouterStatusEntry.from_str().
+"""
+
+desc = RouterStatusEntryV3.create()
+content = desc.get_bytes()
+
+self.assertEqual(desc, RouterStatusEntryV3.from_str(content))
+
+self.assertRaisesWith(NotImplementedError, 'Please use the from_str() 
method from RouterStatusEntry subclasses, not RouterStatusEntry itself', 
RouterStatusEntry.from_str, content)
+self.assertRaisesWith(ValueError, "Router status entries don't have their 
own @type annotation. As such providing a 'descriptor_type' argument with 
RouterStatusEntry.from_str() does not work. Please drop the 'descriptor_type' 
argument when using this these subclasses' from_str() method.", 
RouterStatusEntryV3.from_str, content, descriptor_type = 
'network-status-consensus-3 1.0')
+
   def test_fingerprint_decoding(self):
 """
 Tests for the _base64_to_hex() helper.



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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit 85b1438cf5e6b8bd1c4f2c5ee317d241db645257
Author: Translation commit bot 
Date:   Wed Nov 21 20:15:04 2018 +

Update translations for abouttor-homepage
---
 es/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd
index 671954b62..2bb31865c 100644
--- a/es/aboutTor.dtd
+++ b/es/aboutTor.dtd
@@ -38,10 +38,10 @@
 
 
 
-
+
 
 
-
+
 
 
 

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit 314013e8a388c69705c027b604dd6a80f3de4f33
Author: Translation commit bot 
Date:   Wed Nov 21 19:45:04 2018 +

Update translations for abouttor-homepage
---
 es/aboutTor.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd
index edc852448..671954b62 100644
--- a/es/aboutTor.dtd
+++ b/es/aboutTor.dtd
@@ -35,9 +35,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

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


[tor-commits] [stem/master] Python3 unit test regressions with new Descriptor.from_str() tests

2018-11-21 Thread atagar
commit 2ea93474b863b4c63bff2652cc6c918c657211e7
Author: Damian Johnson 
Date:   Wed Nov 21 09:29:16 2018 -0800

Python3 unit test regressions with new Descriptor.from_str() tests

Oops, couple unicode-vs-bytes mistakes...

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

  ==
  ERROR: test_from_str_multiple
  --
  Traceback (most recent call last):
File "/home/atagar/Desktop/stem/test/unit/descriptor/descriptor.py", 
line 45, in test_from_str_multiple
  RelayDescriptor.content({'router': 'relay2 71.35.133.197 9001 0 0'}),
  TypeError: sequence item 1: expected str instance, bytes found

  ==
  ERROR: test_from_str_type_handling
  --
  Traceback (most recent call last):
File "/home/atagar/Desktop/stem/test/unit/descriptor/descriptor.py", 
line 33, in test_from_str_type_handling
  desc = Descriptor.from_str('@type server-descriptor 1.0\n' + 
desc_text)
  TypeError: Can't convert 'bytes' object to str implicitly

  --

I'm also making from_str() normalize unicode to bytes so the method isn't a
misnomer for python3.
---
 stem/descriptor/__init__.py| 4 ++--
 test/unit/descriptor/descriptor.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 17bea678..1b38783c 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -722,7 +722,7 @@ class Descriptor(object):
 
 .. versionadded:: 1.8.0
 
-:param bytes content: string to construct the descriptor from
+:param str,bytes content: string to construct the descriptor from
 :param bool multiple: if provided with **True** this provides a list of
   descriptors rather than a single one
 :param dict kwargs: additional arguments for 
:func:`~stem.descriptor.__init__.parse_file`
@@ -741,7 +741,7 @@ class Descriptor(object):
   kwargs['descriptor_type'] = str(TypeAnnotation(cls.TYPE_ANNOTATION_NAME, 
1, 0))[6:]
 
 is_multiple = kwargs.pop('multiple', False)
-results = list(parse_file(io.BytesIO(content), **kwargs))
+results = 
list(parse_file(io.BytesIO(stem.util.str_tools._to_bytes(content)), **kwargs))
 
 if is_multiple:
   return results
diff --git a/test/unit/descriptor/descriptor.py 
b/test/unit/descriptor/descriptor.py
index cedb3832..9de70206 100644
--- a/test/unit/descriptor/descriptor.py
+++ b/test/unit/descriptor/descriptor.py
@@ -30,7 +30,7 @@ class TestDescriptor(unittest.TestCase):
 desc = Descriptor.from_str(desc_text, descriptor_type = 'server-descriptor 
1.0')
 self.assertEqual('caerSidi', desc.nickname)
 
-desc = Descriptor.from_str('@type server-descriptor 1.0\n' + desc_text)
+desc = Descriptor.from_str(b'@type server-descriptor 1.0\n' + desc_text)
 self.assertEqual('caerSidi', desc.nickname)
 
 desc = RelayDescriptor.from_str(desc_text)
@@ -39,8 +39,8 @@ class TestDescriptor(unittest.TestCase):
 self.assertRaisesWith(TypeError, "Unable to determine the descriptor's 
type. filename: '', first line: 'router caerSidi 71.35.133.197 9001 
0 0'", Descriptor.from_str, desc_text)
 
   def test_from_str_multiple(self):
-desc_text = '\n'.join((
-  '@type server-descriptor 1.0',
+desc_text = b'\n'.join((
+  b'@type server-descriptor 1.0',
   RelayDescriptor.content({'router': 'relay1 71.35.133.197 9001 0 0'}),
   RelayDescriptor.content({'router': 'relay2 71.35.133.197 9001 0 0'}),
 ))

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


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

2018-11-21 Thread translation
commit 47592ebd718f2f8c112e055aa12734f1d1e41001
Author: Translation commit bot 
Date:   Wed Nov 21 16:49:17 2018 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 8ab00cb40..c34bd0829 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-11-07 09:09+\n"
+"PO-Revision-Date: 2018-11-21 16:28+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@ msgid ""
 "The bug report could not be sent, likely due to network problems. Please try 
to reconnect to the network and click send again.\n"
 "\n"
 "If it does not work, you will be offered to save the bug report."
-msgstr "\n\nBuggrapporten kunde inte skickas, troligen på grund av 
nätverksproblem. Försök att ansluta till nätverket på nytt och klicka på 
skicka igen.\n\nOm det inte fungerar kommer du att få möjlighet att spara 
buggrapporten."
+msgstr "\n\nFelrapporten kunde inte skickas, troligen på grund av 
nätverksproblem. Försök att ansluta till nätverket på nytt och klicka på 
skicka igen.\n\nOm det inte fungerar kommer du att få möjlighet att spara 
felrapporten."
 
 #: ../whisperBack/gui.py:222
 msgid "Your message has been sent."
@@ -124,7 +124,7 @@ msgid ""
 "As a work-around you can save the bug report as a file on a USB drive and try 
to send it to us at %s from your email account using another system. Note that 
your bug report will not be anonymous when doing so unless you take further 
steps yourself (e.g. using Tor with a throw-away email account).\n"
 "\n"
 "Do you want to save the bug report to a file?"
-msgstr "Buggrapporten kunde inte skickas, troligen på grund av 
nätverksproblem.\n\nFör att komma runt problemet kan du spara buggrapporten 
som en fil på en USB-sticka och sedan försöka skicka den till oss på %s 
från ett e-post konto på ett annat system. Notera att din buggrapport då 
inte kommer vara anonym såvida du inte vidtar ytterligare åtgärder själv 
för att säkerställa detta (t.ex. använder Tor med ett tillfälligt e-post 
konto).\n\nVill du spara buggrapporten till en fil?"
+msgstr "Felrapporten kunde inte skickas, troligen på grund av 
nätverksproblem.\n\nFör att komma runt problemet kan du spara felrapporten 
som en fil på en USB-sticka och sedan försöka skicka den till oss på %s 
från ett e-post konto på ett annat system. Notera att din felrapport då inte 
kommer vara anonym såvida du inte vidtar ytterligare åtgärder själv för 
att säkerställa detta (t.ex. använder Tor med ett tillfälligt 
e-postkonto).\n\nVill du spara felrapporten till en fil?"
 
 #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
@@ -189,7 +189,7 @@ msgstr "Sammanfattning"
 
 #: ../data/whisperback.ui.h:23
 msgid "Bug description"
-msgstr "Buggbeskrivning"
+msgstr "Felbeskrivning"
 
 #: ../data/whisperback.ui.h:24
 msgid "Help:"

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


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

2018-11-21 Thread translation
commit 4985d5224307c67994ad778321beee87333446ad
Author: Translation commit bot 
Date:   Wed Nov 21 16:48:52 2018 +

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

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 27ec75a3a..3755ab3b9 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-11-20 04:56+\n"
+"PO-Revision-Date: 2018-11-21 16:34+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ 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 "Besök https://www.torproject.org/\;>Tor webbplatsen 
för mer information om hur du använder Tor säkert.  Du kan nu surfa på 
nätet anonymt."
+msgstr "Besök https://www.torproject.org/\;>Tor-webbplatsen 
för mer information om hur du använder Tor säkert.  Du kan nu surfa på 
nätet anonymt."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Det finns en tillgänglig säkerhets uppdatering för Tor Browser."
@@ -80,19 +80,19 @@ msgid ""
 msgstr "Tor-projektet är en US 501(c)(3) non-profit organisation som utför 
forskning, utveckling, och utbildning inom anonymitet och integritet på 
nätet."
 
 msgid "Learn More "
-msgstr "Mer information "
+msgstr "Lär dig mer "
 
 msgid "Go"
 msgstr "Byt"
 
 msgid "Short User Manual"
-msgstr "Användarmanual"
+msgstr "Kort användarmanual"
 
 msgid "Donate to Support Tor"
 msgstr "Donera till Tor"
 
 msgid "Tor Q Site"
-msgstr "Frågor och svar"
+msgstr "Webbplats för frågor och svar om Tor"
 
 msgid "Volunteer"
 msgstr "Hjälp till"
@@ -107,7 +107,7 @@ msgid "However, it does not appear to be Tor Browser."
 msgstr "Dock verkar det inte vara Tor Browser."
 
 msgid "Run a Relay"
-msgstr "Starta ett Relä"
+msgstr "Starta en relä"
 
 msgid "Stay Anonymous"
 msgstr "Förbli anonym"

___
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-11-21 Thread translation
commit 8fcb7fea5358d7171b9097eaea0763b4b4c55c7d
Author: Translation commit bot 
Date:   Wed Nov 21 16:49:01 2018 +

Update translations for tor-launcher-properties
---
 sv/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties
index 92800d733..406dfb9f1 100644
--- a/sv/torlauncher.properties
+++ b/sv/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta 
kan bero på ett fel i din torrc-fil, en bugg i Tor eller ett annat program på 
ditt system, eller ett hårdvarufel. Tills dess att du har fixat det 
underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
-torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i 
Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor 
Browser kommer inte kunna komma åt några sidor förrän du har startat om 
Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår 
support.
+torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta 
kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på 
ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det 
underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
+torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i 
Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor 
Browser kommer inte kunna komma åt några sidor förrän du har startat om 
Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår 
support.
 torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina 
flikar i webbläsaren.
 torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
 torlauncher.tor_failed_to_start=Det gick inte att starta Tor.

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


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

2018-11-21 Thread translation
commit 28a8a7a56d0a269681f779f5d9b02c296cbd8526
Author: Translation commit bot 
Date:   Wed Nov 21 16:48:08 2018 +

Update translations for torbutton-torbuttonproperties
---
 sv/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/torbutton.properties b/sv/torbutton.properties
index 83f5eee71..aaa6856e3 100644
--- a/sv/torbutton.properties
+++ b/sv/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.popup.dontask = Hämta hem filer automatiskt i 
fortsättningen
 torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. 
Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
 torbutton.security_settings.menu.title = Säkerhetsinställningar
 torbutton.title.prompt_torbrowser = Viktig information om Torbutton 
-torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan 
inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är 
säkert att använda Torbutton i en webbläsare som också används för 
icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något 
annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du 
avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar 
din integritet bättre än vanliga Firefox, även när Firefox används med Tor 
Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och 
klicka på Ta bort-knappen bredvid Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan 
inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är 
säkert att använda Torbutton i en webbläsare som också används för 
icke-Tor surfning. Det var för många fel som vi inte kunde åtgärda på 
något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör 
du avinstallera Tor Browser och hämta Tor Browser Bundle. Tor Browser skyddar 
din integritet bättre än vanliga Firefox, även när Firefox används med Tor 
Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och 
klicka på Ta bort-knappen bredvid Torbutton.
 torbutton.popup.short_torbrowser = Viktig information om 
Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för 
mer information.
 
 torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra 
din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för 
att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker 
på att du vill aktivera plugins?\n\n

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


[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2018-11-21 Thread translation
commit dfb14dc60ef684adf5975af18e1641802db0cb8f
Author: Translation commit bot 
Date:   Wed Nov 21 16:46:37 2018 +

Update translations for tails-greeter-2_completed
---
 sv/sv.po | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 43fdf6206..0b91cb787 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,14 +3,25 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# WinterFairy , 2016
+# mathiasfriman4896b3d1564846bb , 2016
+# runasand , 2016
+# Anders Nilsson , 2016
+# Daniel Sjöberg , 2016
+# Nikolai Stenfors , 2016
+# Jacob Andersson , 2017
+# Bo Serrander , 2017
+# Jonatan Nyberg, 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Bo Serrander , 2017\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: Jonatan Nyberg, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,7 +210,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
-msgstr "Anslut direkt till Tor-nätverket (förvald)."
+msgstr "Anslut direkt till Tor-nätverket (standard)."
 
 #: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge or local proxy"

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


[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-11-21 Thread translation
commit 55ca63da7812911fbff6bb3beb5ba64972371b72
Author: Translation commit bot 
Date:   Wed Nov 21 16:46:31 2018 +

Update translations for tails-greeter-2
---
 sv/sv.po | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 43fdf6206..0b91cb787 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,14 +3,25 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# WinterFairy , 2016
+# mathiasfriman4896b3d1564846bb , 2016
+# runasand , 2016
+# Anders Nilsson , 2016
+# Daniel Sjöberg , 2016
+# Nikolai Stenfors , 2016
+# Jacob Andersson , 2017
+# Bo Serrander , 2017
+# Jonatan Nyberg, 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Bo Serrander , 2017\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: Jonatan Nyberg, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,7 +210,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
-msgstr "Anslut direkt till Tor-nätverket (förvald)."
+msgstr "Anslut direkt till Tor-nätverket (standard)."
 
 #: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge or local proxy"

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


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-11-21 Thread translation
commit b7ddb7ab302b638e6a84e8b302ecb94e45901f61
Author: Translation commit bot 
Date:   Wed Nov 21 16:45:48 2018 +

Update translations for liveusb-creator
---
 sv/sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 4b39e07ed..17c2b5fb3 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-20 12:34+0200\n"
-"PO-Revision-Date: 2018-11-07 06:48+\n"
+"PO-Revision-Date: 2018-11-21 16:30+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -172,7 +172,7 @@ msgstr "Partitionerar enheten %(device)s"
 #: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
-msgstr "Enheten '%(device)s' stöds inte, anmäl detta som en bugg."
+msgstr "Enheten '%(device)s' stöds inte, anmäl detta som ett fel."
 
 #: ../tails_installer/creator.py:998
 msgid "Trying to continue anyway."

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


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

2018-11-21 Thread translation
commit 918076c31e4bf4a1a3073c10ec0b583bf19a01cc
Author: Translation commit bot 
Date:   Wed Nov 21 16:46:14 2018 +

Update translations for tails-iuk
---
 sv.po | 101 +-
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/sv.po b/sv.po
index c0badcb02..0e622ecf1 100644
--- a/sv.po
+++ b/sv.po
@@ -6,14 +6,15 @@
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-03-12 15:24+\n"
-"Last-Translator: Jacob Andersson \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-11-21 16:30+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,18 +22,18 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "För debuginformation, kör följande kommando: sudo 
tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "Fel vid sökning efter uppgraderingar "
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -41,64 +42,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Kunde inte avgöra om någon uppgradering finns tillgänglig från 
vår hemsida.\n\nKontrollera din nätverksanslutning, och starta om Tails 
för att försöka uppgradera igen.\n\nOm problemet kvarstår, se 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "ingen automatisk uppgradering finns tillgänglig från vår hemsida 
för den här versionen"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
 msgstr "din enhet är skapades inte med Tails installerare"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tails startades från en DVD eller skrivskyddad enhet"
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "där är inte tillräckligt med ledigt utrymme på Tails 
systempartition"
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "inte tillräckligt med användbart minne på systemet"
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "Ingen förklaring tillgänglig för orsaken \"%{reason}s\"."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "Systemet är redan senaste versionen"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "Denna version av Tails är inte den senaste, och kan innehålla 
säkerhetsproblem."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr "Den tillgängliga steguppgraderingen kräver %{space_needed}s ledigt 
utrymme på Tails systempartition,  men endast %{free_space}s finns 
tillgängligt."
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:334
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr "Den tillgängliga steguppgraderingen kräver %{memory_needed}s ledigt 
minne, men endast %{free_memory}s finns tillgängligt."
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:356
 msgid ""
 "An incremental upgrade is available, but no full upgrade is.\n"
 "This should not happen. 

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

2018-11-21 Thread translation
commit 1b42ee531c6ff50fe351d37163b7a7239e69af97
Author: Translation commit bot 
Date:   Wed Nov 21 16:46:05 2018 +

Update translations for tails-misc
---
 sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index b8c7660dd..bbbd8bb70 100644
--- a/sv.po
+++ b/sv.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-20 04:57+\n"
+"PO-Revision-Date: 2018-11-21 16:30+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Hjälp oss att fixa ditt fel!\nLäs våra 
instruktioner för att rapportera fel.\nInkludera inte mer 
personlig information än nödvändigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gör det möjligt för oss 
att komma i kontakt med dig för att reda ut problemet. Det här är 
nödvändigt för den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation är oanvändbara. Å andra sidan 
ger det också en möjlighet för obehöriga, som din e-post- eller 
Internetleverantör, att bekräfta att du använder Tails.\n\n"
+msgstr "Hjälp oss att åtgärda ditt fel!\nLäs våra instruktioner för att rapportera 
fel.\nInkludera inte mer personlig information än 
nödvändigt!\nOm att ge oss din e-postadress\n\nAtt 
ge oss din e-postadress gör det möjligt för oss att komma i kontakt med dig 
för att reda ut problemet. Det här är nödvändigt för den stora 
majoriteten av rapporterna vi tar emot eftersom att de flesta rapporter utan 
kontaktinformation är oanvändbara. Å andra sidan ger det också en 
möjlighet för obehöriga, som din e-post- eller Internetleverantör, att 
bekräfta att du använder Tails.\n\n"
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
 msgid ""

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


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

2018-11-21 Thread translation
commit fee920c797e4dedf4544e4cc67c217a0ac294005
Author: Translation commit bot 
Date:   Wed Nov 21 16:46:19 2018 +

Update translations for tails-iuk_completed
---
 sv.po | 101 +-
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/sv.po b/sv.po
index c0badcb02..0e622ecf1 100644
--- a/sv.po
+++ b/sv.po
@@ -6,14 +6,15 @@
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-03-12 15:24+\n"
-"Last-Translator: Jacob Andersson \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-11-21 16:30+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,18 +22,18 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "För debuginformation, kör följande kommando: sudo 
tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "Fel vid sökning efter uppgraderingar "
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -41,64 +42,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Kunde inte avgöra om någon uppgradering finns tillgänglig från 
vår hemsida.\n\nKontrollera din nätverksanslutning, och starta om Tails 
för att försöka uppgradera igen.\n\nOm problemet kvarstår, se 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "ingen automatisk uppgradering finns tillgänglig från vår hemsida 
för den här versionen"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
 msgstr "din enhet är skapades inte med Tails installerare"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tails startades från en DVD eller skrivskyddad enhet"
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "där är inte tillräckligt med ledigt utrymme på Tails 
systempartition"
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "inte tillräckligt med användbart minne på systemet"
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "Ingen förklaring tillgänglig för orsaken \"%{reason}s\"."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "Systemet är redan senaste versionen"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "Denna version av Tails är inte den senaste, och kan innehålla 
säkerhetsproblem."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr "Den tillgängliga steguppgraderingen kräver %{space_needed}s ledigt 
utrymme på Tails systempartition,  men endast %{free_space}s finns 
tillgängligt."
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:334
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr "Den tillgängliga steguppgraderingen kräver %{memory_needed}s ledigt 
minne, men endast %{free_memory}s finns tillgängligt."
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:356
 msgid ""
 "An incremental upgrade is available, but no full upgrade is.\n"
 "This should 

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

2018-11-21 Thread translation
commit 337a468419eec68efbd8f5f94cc382a016591ba7
Author: Translation commit bot 
Date:   Wed Nov 21 16:45:18 2018 +

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

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 06de0f97a..9af835227 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-11-20 04:58+\n"
+"PO-Revision-Date: 2018-11-21 16:38+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "Något gick tyvärr fel med din förfrågan."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Rapportera en bugg"
+msgstr "Rapportera ett fel"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
@@ -111,7 +111,7 @@ msgstr "Steg %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Ladda ner %s Tor Browser  %s"
+msgstr "Hämta %s Tor Browser  %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -340,7 +340,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor 
Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser."
+msgstr "För att ange bryggor i Tor Browser, gå till %s hämtningssidan för 
Tor Browser %s och följ instruktionerna för att hämta och starta Tor 
Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

___
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-11-21 Thread translation
commit 558df4fbe6d15948edc2e6d90c698859d90b0d73
Author: Translation commit bot 
Date:   Wed Nov 21 16:45:12 2018 +

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

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 06de0f97a..9af835227 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-11-20 04:58+\n"
+"PO-Revision-Date: 2018-11-21 16:38+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "Något gick tyvärr fel med din förfrågan."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Rapportera en bugg"
+msgstr "Rapportera ett fel"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
@@ -111,7 +111,7 @@ msgstr "Steg %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Ladda ner %s Tor Browser  %s"
+msgstr "Hämta %s Tor Browser  %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -340,7 +340,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor 
Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser."
+msgstr "För att ange bryggor i Tor Browser, gå till %s hämtningssidan för 
Tor Browser %s och följ instruktionerna för att hämta och starta Tor 
Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit 1722833ff83c7677282338b7cced0dd7fe450092
Author: Translation commit bot 
Date:   Wed Nov 21 15:16:08 2018 +

Update translations for abouttor-homepage
---
 ach/aboutTor.dtd  | 5 +
 af/aboutTor.dtd   | 5 +
 am/aboutTor.dtd   | 5 +
 ar/aboutTor.dtd   | 5 +
 arn/aboutTor.dtd  | 5 +
 ast/aboutTor.dtd  | 5 +
 az/aboutTor.dtd   | 5 +
 be/aboutTor.dtd   | 5 +
 bg/aboutTor.dtd   | 5 +
 bn/aboutTor.dtd   | 5 +
 bn_BD/aboutTor.dtd| 5 +
 bo/aboutTor.dtd   | 5 +
 br/aboutTor.dtd   | 5 +
 bs/aboutTor.dtd   | 5 +
 ca/aboutTor.dtd   | 5 +
 cs/aboutTor.dtd   | 5 +
 cy/aboutTor.dtd   | 5 +
 da/aboutTor.dtd   | 5 +
 de/aboutTor.dtd   | 5 +
 dz/aboutTor.dtd   | 5 +
 el/aboutTor.dtd   | 5 +
 en/aboutTor.dtd   | 5 +
 en_GB/aboutTor.dtd| 5 +
 eo/aboutTor.dtd   | 5 +
 es/aboutTor.dtd   | 5 +
 es_AR/aboutTor.dtd| 5 +
 es_CL/aboutTor.dtd| 5 +
 es_CO/aboutTor.dtd| 5 +
 es_MX/aboutTor.dtd| 5 +
 et/aboutTor.dtd   | 5 +
 eu/aboutTor.dtd   | 5 +
 fa/aboutTor.dtd   | 5 +
 fi/aboutTor.dtd   | 5 +
 fil/aboutTor.dtd  | 5 +
 fo/aboutTor.dtd   | 5 +
 fr/aboutTor.dtd   | 5 +
 fur/aboutTor.dtd  | 5 +
 fy/aboutTor.dtd   | 5 +
 ga/aboutTor.dtd   | 5 +
 gd/aboutTor.dtd   | 5 +
 gl/aboutTor.dtd   | 5 +
 gu/aboutTor.dtd   | 5 +
 gu_IN/aboutTor.dtd| 5 +
 he/aboutTor.dtd   | 5 +
 hi/aboutTor.dtd   | 5 +
 hr/aboutTor.dtd   | 5 +
 hr_HR/aboutTor.dtd| 5 +
 ht/aboutTor.dtd   | 5 +
 hu/aboutTor.dtd   | 5 +
 hy/aboutTor.dtd   | 5 +
 ia/aboutTor.dtd   | 5 +
 id/aboutTor.dtd   | 5 +
 is/aboutTor.dtd   | 5 +
 it/aboutTor.dtd   | 5 +
 ja/aboutTor.dtd   | 5 +
 jv/aboutTor.dtd   | 5 +
 ka/aboutTor.dtd   | 5 +
 kk/aboutTor.dtd   | 5 +
 km/aboutTor.dtd   | 5 +
 kn/aboutTor.dtd   | 5 +
 ko/aboutTor.dtd   | 5 +
 ku/aboutTor.dtd   | 5 +
 ku_IQ/aboutTor.dtd| 5 +
 ky/aboutTor.dtd   | 5 +
 la/aboutTor.dtd   | 5 +
 lb/aboutTor.dtd   | 5 +
 lg/aboutTor.dtd   | 5 +
 ln/aboutTor.dtd   | 5 +
 lo/aboutTor.dtd   | 5 +
 lt/aboutTor.dtd   | 5 +
 lv/aboutTor.dtd   | 5 +
 mg/aboutTor.dtd   | 5 +
 mi/aboutTor.dtd   | 5 +
 mk/aboutTor.dtd   | 5 +
 ml/aboutTor.dtd   | 5 +
 mn/aboutTor.dtd   | 5 +
 mr/aboutTor.dtd   | 5 +
 ms_MY/aboutTor.dtd| 5 +
 mt/aboutTor.dtd   | 5 +
 my/aboutTor.dtd   | 5 +
 nah/aboutTor.dtd  | 5 +
 nap/aboutTor.dtd  | 5 +
 nb/aboutTor.dtd   | 5 +
 ne/aboutTor.dtd   | 5 +
 nl/aboutTor.dtd   | 5 +
 nl_BE/aboutTor.dtd| 5 +
 nn/aboutTor.dtd   | 5 +
 nso/aboutTor.dtd  | 5 +
 oc/aboutTor.dtd   | 5 +
 om/aboutTor.dtd   | 5 +
 or/aboutTor.dtd   | 5 +
 pa/aboutTor.dtd   | 5 +
 pap/aboutTor.dtd  | 5 +
 pl/aboutTor.dtd   | 5 +
 pms/aboutTor.dtd  | 5 +
 ps/aboutTor.dtd   | 5 +
 pt/aboutTor.dtd   | 5 +
 pt_BR/aboutTor.dtd| 5 +
 pt_PT/aboutTor.dtd| 5 +
 ro/aboutTor.dtd   | 5 +
 ru/aboutTor.dtd   | 5 +
 sco/aboutTor.dtd  | 5 +
 si_LK/aboutTor.dtd| 5 +
 sk/aboutTor.dtd   | 5 +
 sk_SK/aboutTor.dtd| 5 +
 sl/aboutTor.dtd   | 5 +
 sl_SI/aboutTor.dtd| 5 +
 sn/aboutTor.dtd   | 5 +
 so/aboutTor.dtd   | 5 +
 son/aboutTor.dtd  | 5 +
 sq/aboutTor.dtd   | 5 +
 sr/aboutTor.dtd   | 5 +
 sr@latin/aboutTor.dtd | 5 +
 st/aboutTor.dtd   | 5 +
 sv/aboutTor.dtd   | 5 +
 ta/aboutTor.dtd   | 5 +
 te/aboutTor.dtd   | 5 +
 tg/aboutTor.dtd   | 5 +
 th/aboutTor.dtd   | 5 +
 ti/aboutTor.dtd   | 5 +
 tk/aboutTor.dtd   | 5 +
 tr/aboutTor.dtd   | 5 +
 ug@Arab/aboutTor.dtd  | 5 +
 uk/aboutTor.dtd   | 5 +
 ur/aboutTor.dtd   | 5 +
 uz/aboutTor.dtd   | 5 +
 vi/aboutTor.dtd   | 5 +
 zh_CN/aboutTor.dtd| 5 +
 zh_HK/aboutTor.dtd| 5 +
 zh_TW/aboutTor.dtd| 5 +
 130 files changed, 650 insertions(+)

diff --git a/ach/aboutTor.dtd b/ach/aboutTor.dtd
index 6efb202e1..a36d812c0 100644
--- a/ach/aboutTor.dtd
+++ b/ach/aboutTor.dtd
@@ -35,8 +35,13 @@
 
 
 
+
+
+
+
 
 
+
 
 
 
diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index ddf19f99d..84fcf8b89 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -35,8 +35,13 @@
 
 
 
+
+
+
+
 
 
+
 
 
 
diff --git a/am/aboutTor.dtd b/am/aboutTor.dtd
index 6efb202e1..a36d812c0 100644
--- a/am/aboutTor.dtd
+++ b/am/aboutTor.dtd
@@ -35,8 +35,13 @@
 
 
 
+
+
+

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2018-11-21 Thread translation
commit ec4f3aa44e7c8a25ff9484aa4f7280d13037ad41
Author: Translation commit bot 
Date:   Wed Nov 21 15:16:14 2018 +

Update translations for abouttor-homepage_completed
---
 en/aboutTor.dtd | 5 +
 1 file changed, 5 insertions(+)

diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 6efb202e1..a36d812c0 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -35,8 +35,13 @@
 
 
 
+
+
+
+
 
 
+
 
 
 

___
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-11-21 Thread translation
commit 682f7a1f316fed0ad03c47e908b6d437c4ee39ed
Author: Translation commit bot 
Date:   Wed Nov 21 14:45:20 2018 +

Update translations for bridgedb_completed
---
 fr/LC_MESSAGES/bridgedb.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index fe7dd4f89..153b7c45e 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AO , 2018
 # apaddlingduck, 2014
 # Boubou , 2015
 # Cryptie , 2014
 # elouann, 2015
 # fayçal fatihi , 2014
-# French language coordinator , 2017-2018
-# French language coordinator , 2016-2017
+# AO , 2017-2018
+# AO , 2016-2017
 # Frisson Reynald , 2014
 # hpatte, 2014
 # Lucas Leroy , 2014
@@ -22,15 +23,15 @@
 # syl_, 2016
 # themen , 2014
 # Towinet, 2014-2015
-# French language coordinator , 2015
+# AO , 2015
 # Yannick Heintz, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: 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-04-18 15:58+\n"
-"Last-Translator: French language coordinator \n"
+"PO-Revision-Date: 2018-11-21 14:37+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +53,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Désolé ! Quelque chose a mal tourné avec votre requête."
+msgstr "Désolé ! Un problème est survenu à la suite de votre requête."
 
 #: 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/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2018-11-21 Thread translation
commit 98123867c27f82c986c3aea663a3f9c092747f7e
Author: Translation commit bot 
Date:   Wed Nov 21 14:45:09 2018 +

Update translations for abouttor-homepage_completed
---
 fr/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index 959842c6d..6690a0913 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
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-11-21 Thread translation
commit 8f65f57ed65dae81df746311e2eeae093fdefac6
Author: Translation commit bot 
Date:   Wed Nov 21 14:45:15 2018 +

Update translations for bridgedb
---
 fr/LC_MESSAGES/bridgedb.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index fe7dd4f89..153b7c45e 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AO , 2018
 # apaddlingduck, 2014
 # Boubou , 2015
 # Cryptie , 2014
 # elouann, 2015
 # fayçal fatihi , 2014
-# French language coordinator , 2017-2018
-# French language coordinator , 2016-2017
+# AO , 2017-2018
+# AO , 2016-2017
 # Frisson Reynald , 2014
 # hpatte, 2014
 # Lucas Leroy , 2014
@@ -22,15 +23,15 @@
 # syl_, 2016
 # themen , 2014
 # Towinet, 2014-2015
-# French language coordinator , 2015
+# AO , 2015
 # Yannick Heintz, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: 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-04-18 15:58+\n"
-"Last-Translator: French language coordinator \n"
+"PO-Revision-Date: 2018-11-21 14:37+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +53,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Désolé ! Quelque chose a mal tourné avec votre requête."
+msgstr "Désolé ! Un problème est survenu à la suite de votre requête."
 
 #: 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/abouttor-homepage] Update translations for abouttor-homepage

2018-11-21 Thread translation
commit d65da6c030c3bbfacd8b0bb6a374c16fdbd7b9d6
Author: Translation commit bot 
Date:   Wed Nov 21 14:45:03 2018 +

Update translations for abouttor-homepage
---
 fr/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index 959842c6d..6690a0913 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

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


[tor-commits] [sbws/master] tests: scale lines using torflow's method

2018-11-21 Thread juga
commit 75a6650dbc483385b5fea194df3c7d154f702284
Author: juga0 
Date:   Tue Nov 20 11:23:05 2018 +

tests: scale lines using torflow's method
---
 tests/unit/lib/test_v3bwfile.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index 3367c77..2987aca 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -227,9 +227,10 @@ def test_from_results_read(datadir, tmpdir, conf, args):
 expected_header = V3BWHeader(timestamp_l,
  earliest_bandwidth=earliest_bandwidth,
  latest_bandwidth=latest_bandwidth)
-expected_bwls = [V3BWLine.from_results(results[fp]) for fp in results]
-# bw store now B, not KB
-expected_bwls[0].bw = round(expected_bwls[0].bw / 1000)
+raw_bwls = [V3BWLine.from_results(results[fp]) for fp in results]
+# Scale BWLines using torflow method, since it's the default and BWLines
+# bandwidth is the raw bandwidth.
+expected_bwls = V3BWFile.bw_torflow_scale(raw_bwls)
 expected_f = V3BWFile(expected_header, expected_bwls)
 # This way is going to convert bw to KB
 v3bwfile = V3BWFile.from_results(results)



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


[tor-commits] [sbws/master] generate: Include in help torflow's scaling method

2018-11-21 Thread juga
commit f72f255f6ee712e5b37e5830b7468506f75ca341
Author: juga0 
Date:   Mon Nov 19 18:35:10 2018 +

generate: Include in help torflow's scaling method
---
 sbws/core/generate.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index 42e081a..f9b46cb 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -22,7 +22,9 @@ def gen_parser(sub):
 '(latest.v3bw is an atomically created symlink in the same '\
 'directory as output.) '\
 'If the file is transferred to another host, it should be written to '\
-'a temporary path, then renamed to the V3BandwidthsFile path.'
+'a temporary path, then renamed to the V3BandwidthsFile path.\n'\
+'The default scaling method is torflow\'s one. To use different'\
+'scaling methods or no scaling, see the options.'
 p = sub.add_parser('generate', description=d,
formatter_class=ArgumentDefaultsHelpFormatter)
 p.add_argument('--output', default=None, type=str,



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


[tor-commits] [sbws/master] v3bwfile: remove TODO about torflow's scaling

2018-11-21 Thread juga
commit cc9ce5287ae8cfce8712aaba73db64d88ff808ec
Author: juga0 
Date:   Mon Nov 19 18:40:30 2018 +

v3bwfile: remove TODO about torflow's scaling
---
 sbws/lib/v3bwfile.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index 23387a9..a4511c7 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -509,8 +509,6 @@ class V3BWFile(object):
  'relay_fp2': [Result1, Result2, ...]}
 
 """
-# TODO: change scaling_method to TORFLOW_SCALING before getting this
-# in production
 log.info('Processing results to generate a bandwidth list file.')
 header = V3BWHeader.from_results(results, state_fpath)
 bw_lines_raw = []



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


[tor-commits] [sbws/master] generate: comment torflow's scaling is default

2018-11-21 Thread juga
commit eead1060b4ee58be3b537f1142af46c94fa9e81e
Author: juga0 
Date:   Mon Nov 19 18:29:20 2018 +

generate: comment torflow's scaling is default
---
 sbws/core/generate.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index bd01b05..42e081a 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -81,6 +81,8 @@ def main(args, conf):
 elif args.raw:
 scaling_method = None
 else:
+# sbws will scale as torflow until we have a better algorithm for
+# scaling (#XXX)
 scaling_method = TORFLOW_SCALING
 if args.secs_recent:
 fresh_days = ceil(args.secs_recent / 24 / 60 / 60)



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


[tor-commits] [sbws/master] changelog: add entry for #28446

2018-11-21 Thread juga
commit 95da3f939fd3a83170f86373989341bd5223a541
Author: juga0 
Date:   Mon Nov 19 19:16:14 2018 +

changelog: add entry for #28446
---
 CHANGELOG.md | 5 +
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1615b5e..22c4d5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Ensure de default scaling method is torflow, leave cli option but ignore it,
+  update documentation reflecting this. (#28446).
+
 ### Fixed
 
 - Make sbws round to 3 significant figures in torflow rounding mode, rather



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


[tor-commits] [sbws/master] v3bwfile: ensure torflow's scaling is the default

2018-11-21 Thread juga
commit 54078bd486720f664e583f2604b4260edee0c511
Author: juga0 
Date:   Mon Nov 19 18:29:50 2018 +

v3bwfile: ensure torflow's scaling is the default

Even if that method is call from generate with torflow's scaling
by default.
---
 sbws/lib/v3bwfile.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index ffc15a1..23387a9 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -485,7 +485,8 @@ class V3BWFile(object):
 @classmethod
 def from_results(cls, results, state_fpath='',
  scale_constant=SBWS_SCALE_CONSTANT,
- scaling_method=None, torflow_obs=TORFLOW_OBS_LAST,
+ scaling_method=TORFLOW_SCALING,
+ torflow_obs=TORFLOW_OBS_LAST,
  torflow_cap=TORFLOW_BW_MARGIN,
  torflow_round_digs=PROP276_ROUND_DIG,
  secs_recent=None, secs_away=None, min_num=0,



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


[tor-commits] [sbws/master] generate: remove toflow option, it's the default

2018-11-21 Thread juga
commit ea1f58a885246040cd802f0888aacb51358f40a9
Author: juga0 
Date:   Mon Nov 19 18:15:06 2018 +

generate: remove toflow option, it's the default

So that is less confusing that it's the default.
We already have an option for linear scaling and no scaling.
---
 sbws/core/generate.py | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index 674956f..bd01b05 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -40,10 +40,12 @@ def gen_parser(sub):
'are, but scale them such that we have a budget of '
'scale_constant * num_measured_relays = bandwidth to give '
'out, and we do so proportionally')
-p.add_argument('-t', '--scale-torflow', action='store_const',
-   default=True, const=False,
-   help='If specified, do not use bandwidth values as they '
-   'are, but scale them in the way Torflow does.')
+p.add_argument('-t', '--scale-torflow', action='store_true',
+   default=True,
+   help='If specified, scale measurements using torflow\'s '
+   'method. This option is kept for compatibility with older '
+   'versions and it is silently ignored, since it is the '
+   'default.')
 p.add_argument('-w', '--raw', action='store_true',
help='If specified, do use bandwidth raw measurements '
'without any scaling.')



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


[tor-commits] [sbws/master] doc: rephrase and add generator scaling part

2018-11-21 Thread juga
commit 034426a6c24ce380f46777ac76c20a9d61225ee3
Author: juga0 
Date:   Mon Nov 19 19:22:16 2018 +

doc: rephrase and add generator scaling part
---
 README.md | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 72812b0..93a1653 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,13 @@
 [![Build 
Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://travis-ci.org/https://travis-ci.org/torproject/sbws)
 
 Simple Bandwidth Scanner (called `sbws`) is a Tor bandwidth scanner that
-produces bandwidth measurements files to be used by Directory Authorities.
+produces bandwidth files to be used by Directory Authorities.
 
 The scanner builds two hop circuits consisting of the relay being measured and
-a fast exit. Over these circuits it measures bandwidth.
+a fast exit. Over these circuits it measures bandwidth and store the results.
+
+The generator read the measurement results, scales them using torflow's
+scaling method and creates the bandwidth file.
 
 **WARNING**: This software is intended to be run by researchers using a test
 Tor network, such as chutney or shadow, or by the Tor bandwidth authorities



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


[tor-commits] [sbws/master] tests, v3bwfile: rename bwl_str to raw_bwl_str

2018-11-21 Thread juga
commit 9f537092cae2611f16f298a04175034e21360de5
Author: juga0 
Date:   Wed Nov 21 13:36:45 2018 +

tests, v3bwfile: rename bwl_str to raw_bwl_str
---
 tests/unit/lib/test_v3bwfile.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index 2987aca..f9c50d5 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -38,7 +38,8 @@ header_extra_ls = [timestamp_l, version_l,
software_l, software_version_l, TERMINATOR]
 header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP
 
-bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\
+# Line produced without any scaling.
+raw_bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\
 "desc_bw_avg=10 desc_bw_obs_last=524288 "\
 "desc_bw_obs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \
 "master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \
@@ -46,7 +47,7 @@ bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\
 "node_id=$ rtt=456 success=1 " \
 "time=2018-04-17T14:09:07\n"
 
-v3bw_str = header_extra_str + bwl_str
+v3bw_str = header_extra_str + raw_bwl_str
 
 
 def test_v3bwheader_str():
@@ -219,7 +220,7 @@ def test_v3bwline_from_results_file(datadir):
 bwl = V3BWLine.from_data(d, fp)
 # bw store now B, not KB
 bwl.bw = round(bwl.bw / 1000)
-assert bwl_str == str(bwl)
+assert raw_bwl_str == str(bwl)
 
 
 def test_from_results_read(datadir, tmpdir, conf, args):

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit 71be19de67773648dfa7836a5a2bf3c13a8a8b91
Author: Translation commit bot 
Date:   Wed Nov 21 14:17:00 2018 +

Update translations for tbmanual-contentspot
---
 contents+mk.po | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/contents+mk.po b/contents+mk.po
index cb2396d01..fa37ca44b 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -1,8 +1,8 @@
 # Translators:
 # Zarko Gjurov , 2018
 # Liljana Ackovska , 2018
-# Emma Peel, 2018
 # erinm, 2018
+# Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,6 +86,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Стандардно, Tor Browser не задржува никаква 
историја од вашето прелистување."
+" Колачињата се валидни само за време на 
сесијата (додека не го исклучите Tor"
+" Browser или не побарате Нов Идентитет)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -113,6 +117,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -1069,7 +1075,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.title)
 msgid "Onion Services"
-msgstr "# Onion Услуги"
+msgstr "Onion Услуги"
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.description)
@@ -1196,7 +1202,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.seo_slug)
 msgid "onion-services"
-msgstr ""
+msgstr "Onion-Услуги"
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.title)

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit c58ba2420db28f67ad149ed76e453aea309e79ca
Author: Translation commit bot 
Date:   Wed Nov 21 13:47:02 2018 +

Update translations for tbmanual-contentspot
---
 contents+hr.po| 3 +++
 contents+zh-CN.po | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/contents+hr.po b/contents+hr.po
index c82cf0c9a..f9bf59a85 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -84,6 +84,9 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Pod zadano, Tor Browser ne zadržava nikakvu povijest pregledavanja. 
Kolačići"
+" su valjani samo za jednu sesiju (dok ne izađete iz Tor Browsera ili dok ne "
+"zatražite Novi identitet)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 4f33f1af7..4ca10ea05 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -70,6 +70,8 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"* 默认情况下,Tor 浏览器不保存任何浏览记录。Cookie 仅
在单次会话中有效(到 Tor 浏览器退出或者需要 新身份 时失效)。"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)

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


[tor-commits] [tor/master] Fix a fun heisenbug in memoize_protover_flags()

2018-11-21 Thread nickm
commit 469f47ef8dc8b18104108f0437c860ec88fca6ad
Author: Nick Mathewson 
Date:   Wed Nov 21 07:38:38 2018 -0500

Fix a fun heisenbug in memoize_protover_flags()

After we clear the protover map for getting full, we need to
re-create it, since we are about to use it.

This is a bugfix for bug 28558. It is a bugfix for the code from
ticket 27225, which is not in any released Tor.  Found by Google
OSS-Fuzz, as issue 11475.
---
 src/core/or/versions.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/or/versions.c b/src/core/or/versions.c
index 6f8eea7a6..5d4effcaf 100644
--- a/src/core/or/versions.c
+++ b/src/core/or/versions.c
@@ -399,6 +399,7 @@ memoize_protover_summary(protover_summary_flags_t *out,
 
   if (strmap_size(protover_summary_map) >= MAX_PROTOVER_SUMMARY_MAP_LEN) {
 protover_summary_cache_free_all();
+protover_summary_map = strmap_new();
   }
 
   const protover_summary_flags_t *cached =

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit c26755440bdebc7df13b87e02cb6ce6afca24a04
Author: Translation commit bot 
Date:   Wed Nov 21 12:17:04 2018 +

Update translations for tbmanual-contentspot
---
 contents+ca.po | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index f4d48a223..a5645a7c8 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -82,6 +82,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Per defecte, el navegador Tor no desa l'historial de navegació. Les galetes "
+"només són vàlides per la sessió en marxa (fins que el navegador Tor es "
+"tanqui o Nova "
+"identitat es sol·licitada)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -109,6 +113,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -167,7 +173,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# Mirrors"
-msgstr ""
+msgstr "# Miralls"
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -181,7 +187,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# GetTor"
-msgstr "# Obtenir Tor"
+msgstr "# GetTor"
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)

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


[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2018-11-21 Thread translation
commit 39a34a00b9ccca21cae28245eb4d30fbd2d3700b
Author: Translation commit bot 
Date:   Wed Nov 21 11:47:08 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+it.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+it.po b/contents+it.po
index f8e38bd72..9cb092791 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -84,6 +84,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Per default, il browser Tor non tiene traccia della cronologia. I cookie "
+"sono validi solo per la singola sessione di navigazione (fino a che non si "
+"chiude il Browser o è "
+"richiesta Nuova identità )"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -111,6 +115,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit 3f2b07f37e48ab2583ce47a138183673211419d8
Author: Translation commit bot 
Date:   Wed Nov 21 11:47:02 2018 +

Update translations for tbmanual-contentspot
---
 contents+it.po |  6 ++
 contents+lv.po | 42 +++---
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/contents+it.po b/contents+it.po
index f8e38bd72..9cb092791 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -84,6 +84,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Per default, il browser Tor non tiene traccia della cronologia. I cookie "
+"sono validi solo per la singola sessione di navigazione (fino a che non si "
+"chiude il Browser o è "
+"richiesta Nuova identità )"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -111,6 +115,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
diff --git a/contents+lv.po b/contents+lv.po
index 9904e7c0c..830f53a9e 100644
--- a/contents+lv.po
+++ b/contents+lv.po
@@ -1,5 +1,6 @@
 # Translators:
 # erinm, 2018
+# Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1757,6 +1758,8 @@ msgstr "Zināmās problēmas"
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
+"* Tor ir nepieciešams, ka Jūsu sistēmas laika (un Jūsu laika zonas) "
+"iestatījumi ir pareizi. "
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1764,6 +1767,8 @@ msgid ""
 "* The following firewall software have been known to interfere with Tor and "
 "may need to be temporarily disabled:"
 msgstr ""
+"* Ir zināms, ka šāda ugunsmūru programmatūra traucē Tor un to 
nepieciešams "
+"uz laiku atspējot:"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1773,17 +1778,17 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Kaspersky Internet Security 2012"
-msgstr ""
+msgstr "* Kaspersky Internet Security 2012"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Sophos Antivirus for Mac"
-msgstr ""
+msgstr "* Sophos antivīrus Mac'am"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Microsoft Security Essentials"
-msgstr ""
+msgstr "* Microsoft Security Essentials"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1791,11 +1796,13 @@ msgid ""
 "* Videos that require Adobe Flash are unavailable. Flash is disabled for "
 "security reasons."
 msgstr ""
+"* Nav pieejami video, kuriem nepieciešami Adobe Flash. Drošības apsvērumu 
"
+"dēļ Flash ir atspējots."
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Tor can not use a bridge if a proxy is set."
-msgstr ""
+msgstr "* Tor nevar lietot tiltu, ja ir iestatīts starpniekserveris."
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1803,6 +1810,9 @@ msgid ""
 "* The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to "
 "ensure that each software build is exactly reproducible."
 msgstr ""
+"* Pārluka Tor pakotnes datums ir 2000. gada 1. janvāris 00.00:00 UTC. Tas 
"
+"darīts, lai nodrošinātu, ka ikviens programmatūras būvējums būtu 
precīzi "
+"atveidojams. "
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1812,6 +1822,10 @@ msgid ""
 "executable text files when they are opened\" to \"Ask every time\", then "
 "click OK."
 msgstr ""
+"* Lai lietotu pārlūku Tor ar Ubuntu, lietotājiem jāizpilda čaulas 
skripts. "
+"Atveriet „Datnes” (Unity pārlūks), atveriet Preferences → Uzvedības 
cilne → "
+"Iestatīt „Izpildīt izpildāmas teksta datnes, kad tās atvērtas” uz 
„Jautāt "
+"katru reizi”, tad noklikšķiniet Labi."
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1819,11 +1833,13 @@ msgid ""
 "* Tor Browser can also be started from the command line by running the "
 "following command from inside the Tor Browser directory:"
 msgstr ""
+"* Pārlūku Tor var arī startēt no 

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2018-11-21 Thread translation
commit a91c0175307e89986531513a89f31f4029ef106d
Author: Translation commit bot 
Date:   Wed Nov 21 11:17:44 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+de.po| 45 ++---
 contents+es.po| 45 -
 contents+es_AR.po | 43 ++-
 contents+ga.po| 45 ++---
 contents+it.po| 45 +++--
 contents.pot  | 47 +++
 6 files changed, 220 insertions(+), 50 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index 3579b96d5..8cf29885e 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,15 +1,15 @@
 # Translators:
 # erinm, 2018
-# Jim John , 2018
 # Oliver Parczyk, 2018
 # Curtis Baltimore , 2018
+# Jim John , 2018
 # Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-19 14:20+CET\n"
+"POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -21,8 +21,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/
 #: (content/contents+en-US.lrshowcase.title)
-msgid "How can we help?"
-msgstr "Wie können wir helfen?"
+msgid "Tor Browser User Manual"
+msgstr "Tor Browser Benutzerhandbuch"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)
@@ -86,8 +86,12 @@ msgstr ""
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
+"=\"/managing-identities/#new-identity\">New Identity is requested)."
 msgstr ""
+"Normalerweise speichert der Tor Browser keinen Verlauf. Cookies sind nur für"
+" eine einzige Sitzung gültig (bis der Tor Browser geschlossen wird oder um "
+"eine neue Identität "
+"gebeten wird)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -112,7 +116,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
 msgid ""
-""
 msgstr ""
 "https://tor.eff.org) or [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# GetTor"
 msgstr "# GetTor"
 
@@ -2291,6 +2309,15 @@ msgstr ""
 msgid "becoming-tor-translator"
 msgstr "Werde ein Tor-Übersetzer"
 
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+""
+msgstr ""
+""
+
 #: templates/footer.html:5
 msgid "Our mission:"
 msgstr "Unsere Mission:"
@@ -2328,6 +2355,10 @@ msgstr ""
 msgid "Tor Project | Tor Browser Manual"
 msgstr "Tor Project | Tor Browser Benutzerhandbuch"
 
+#: templates/navbar.html:4
+msgid "Tor Logo"
+msgstr "Tor Logo"
+
 #: templates/navbar.html:40
 msgid "Download Tor Browser"
 msgstr "Tor Browser herunterladen"
@@ -2336,7 +2367,7 @@ msgstr "Tor Browser herunterladen"
 msgid "Search"
 msgstr "Suchen"
 
-#: templates/sidenav.html:4 templates/sidenav.html:30
+#: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Themen"
 
diff --git a/contents+es.po b/contents+es.po
index 25b91b97f..2d8e91125 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,14 +1,14 @@
 # Translators:
 # eulalio barbero espinosa , 2018
-# erinm, 2018
 # Zuhualime Akoochimoya, 2018
+# erinm, 2018
 # Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-19 14:20+CET\n"
+"POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/
 #: (content/contents+en-US.lrshowcase.title)
-msgid "How can we help?"
-msgstr "¿Cómo podemos ayudarte?"
+msgid "Tor Browser User Manual"
+msgstr "Manual de usuario del Navegador Tor »"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)
@@ -83,12 +83,12 @@ msgstr ""
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
+"=\"/managing-identities/#new-identity\">New Identity is requested)."
 msgstr ""
 "De forma predeterminada, el Navegador Tor no conserva ningún historial de "
 "navegación. Los cookies sólo son válidos para una sola sesión (hasta que 
se "
-"cierre el Navegador Tor o se solicite una Nueva Identidad)."
+"cierre el Navegador Tor o se 

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2018-11-21 Thread translation
commit be86478924b921ad61018d7c55b8c117a9ca7c03
Author: Translation commit bot 
Date:   Wed Nov 21 11:17:33 2018 +

Update translations for tbmanual-contentspot
---
 contents+ar.po| 42 ++
 contents+bg.po| 37 +++--
 contents+bn-BD.po | 39 ---
 contents+ca.po| 37 +++--
 contents+cs.po| 41 +
 contents+da.po| 41 +
 contents+de.po| 45 ++---
 contents+el.po| 39 +--
 contents+en-GB.po | 37 +++--
 contents+en.po| 47 +++
 contents+es-AR.po | 43 ++-
 contents+es.po| 45 -
 contents+fa.po| 41 +
 contents+fr.po| 39 +--
 contents+ga.po| 45 ++---
 contents+he.po| 44 +---
 contents+hr.po| 35 ++-
 contents+id.po| 42 --
 contents+is.po| 37 +++--
 contents+it.po| 45 +++--
 contents+ka.po| 43 +++
 contents+lv.po| 37 +++--
 contents+mk.po| 41 +
 contents+nb.po| 37 +++--
 contents+nl.po| 41 +
 contents+pl.po| 41 +
 contents+pt-BR.po | 43 ++-
 contents+ru.po| 37 +++--
 contents+sv.po| 37 +++--
 contents+tr.po| 39 ---
 contents+uk.po| 41 +
 contents+vi.po| 41 +
 contents+zh-CN.po | 37 +++--
 contents+zh-TW.po | 37 +++--
 contents.pot  | 47 +++
 35 files changed, 1169 insertions(+), 251 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 34d618242..7f355d3ee 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1,15 +1,16 @@
 # Translators:
-# erinm, 2018
 # Emma Peel, 2018
 # Mohamed El-Feky , 2018
+# erinm, 2018
+# ButterflyOfFire ButterflyOfFire, 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-19 14:20+CET\n"
+"POT-Creation-Date: 2018-11-21 11:49+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Mohamed El-Feky , 2018\n"
+"Last-Translator: ButterflyOfFire ButterflyOfFire, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/
 #: (content/contents+en-US.lrshowcase.title)
-msgid "How can we help?"
-msgstr ""
+msgid "Tor Browser User Manual"
+msgstr "دليل استخدام متصفّح تور"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)
@@ -77,7 +78,7 @@ msgstr ""
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
+"=\"/managing-identities/#new-identity\">New Identity is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/about/
@@ -102,7 +103,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
 msgid ""
-""
 msgstr ""
 
@@ -160,6 +161,20 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
+msgid "# Mirrors"
+msgstr ""
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"If you're unable to download Tor Browser from the official Tor Project "
+"website, you can instead try downloading it from one of our official "
+"mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# GetTor"
 msgstr "# GetTor"
 
@@ -2063,6 +2078,13 @@ msgstr ""
 msgid "becoming-tor-translator"
 msgstr ""
 
+#: https//tb-manual.torproject.org/en-US/about/
+#: 

[tor-commits] [tor-browser-build/master] Bug 28476: Enable android nightly builds

2018-11-21 Thread boklm
commit 80d0df6b8936729b26544cdb4535b5d1001feaf6
Author: Nicolas Vigier 
Date:   Wed Nov 21 12:02:39 2018 +0100

Bug 28476: Enable android nightly builds

Update testsuite_git_commit to enable android nightly builds.
---
 tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml 
b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
index af7e03d..5f04029 100644
--- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
+++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
@@ -5,7 +5,7 @@ nightly_build_cron_minute: 20
 nightly_build_keep_builds: 2
 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite"
 testsuite_git_url: 
https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git
-testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148
+testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804
 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www"
 nightly_build_nginx_enable: true
 nightly_build_nginx_listen: 127.0.0.1:80

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


[tor-commits] [translation/support-portal] Update translations for support-portal

2018-11-21 Thread translation
commit cf5b7672eef4109c3d2541bf39e1e1700ea72eb2
Author: Translation commit bot 
Date:   Wed Nov 21 08:19:07 2018 +

Update translations for support-portal
---
 contents+tr.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index e25a3bee7..b67e13d8e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,4 +1,5 @@
 # Translators:
+# Kaya Zeren , 2018
 # erinm, 2018
 # Emma Peel, 2018
 # 
@@ -166,8 +167,8 @@ msgid ""
 "Tor Browser can certainly help people access your website in places where it"
 " is blocked."
 msgstr ""
-"Tor Browser kesinlikle sansürcülerin engellediği yerlerdeki 
kullanıcıların "
-"web sitenize erişmesine yardımcı olur."
+"Tor Browser kullanılmasının, sansür uygulanan yerlerdeki 
kullanıcıların web "
+"sitenize erişmesine kesinlikle yardımı olur."
 
 #: http//localhost/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -181,9 +182,9 @@ msgid ""
 "Browser and then using it to navigate to the blocked site will "
 "allow access."
 msgstr ""
-"Genellikle https://www.torproject.org/download/download-;
-"easy.html.en\">Tor Browser uygulamasını indirmek ve engellenen "
-"web sitelerine erişmek için kullanmak yeterlidir."
+"Erişim için genellikle https://www.torproject.org/download;
+"/download-easy.html.en\">Tor Browser uygulamasını indirmek ve "
+"engellenen web sitesinin adresine gitmek yeterlidir."
 
 #: http//localhost/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -197,7 +198,7 @@ msgid ""
 "href=\"https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">pluggable transports."
 msgstr ""
-"Ağır sansür uygulanan yerlerde sansürden kaçınmak için https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">takılabilir aktarımlar gibi çeşitli "
 "seçenekler bulunur. "
@@ -258,7 +259,7 @@ msgstr ""
 "Tor Browser https://www.eff.org/https-everywhere\;>HTTPS "
 "Everywhere ve https://noscript.net/\;>NoScript eklentileri kurulmuş "
-"olarak gelir. Bunun dışında bir eklenti kurmak anonim kalmanızı "
+"olarak gelir. Bunlardan başka eklentiler kurmak anonim kalmanızı "
 "engelleyebilir."
 
 #: http//localhost/faq/faq-3/

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


[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2018-11-21 Thread translation
commit 57df4ab206c083aeb1b894d834e8d2c6357adf0e
Author: Translation commit bot 
Date:   Wed Nov 21 08:19:13 2018 +

Update translations for support-portal_completed
---
 contents+tr.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index e25a3bee7..b67e13d8e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,4 +1,5 @@
 # Translators:
+# Kaya Zeren , 2018
 # erinm, 2018
 # Emma Peel, 2018
 # 
@@ -166,8 +167,8 @@ msgid ""
 "Tor Browser can certainly help people access your website in places where it"
 " is blocked."
 msgstr ""
-"Tor Browser kesinlikle sansürcülerin engellediği yerlerdeki 
kullanıcıların "
-"web sitenize erişmesine yardımcı olur."
+"Tor Browser kullanılmasının, sansür uygulanan yerlerdeki 
kullanıcıların web "
+"sitenize erişmesine kesinlikle yardımı olur."
 
 #: http//localhost/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -181,9 +182,9 @@ msgid ""
 "Browser and then using it to navigate to the blocked site will "
 "allow access."
 msgstr ""
-"Genellikle https://www.torproject.org/download/download-;
-"easy.html.en\">Tor Browser uygulamasını indirmek ve engellenen "
-"web sitelerine erişmek için kullanmak yeterlidir."
+"Erişim için genellikle https://www.torproject.org/download;
+"/download-easy.html.en\">Tor Browser uygulamasını indirmek ve "
+"engellenen web sitesinin adresine gitmek yeterlidir."
 
 #: http//localhost/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -197,7 +198,7 @@ msgid ""
 "href=\"https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">pluggable transports."
 msgstr ""
-"Ağır sansür uygulanan yerlerde sansürden kaçınmak için https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">takılabilir aktarımlar gibi çeşitli "
 "seçenekler bulunur. "
@@ -258,7 +259,7 @@ msgstr ""
 "Tor Browser https://www.eff.org/https-everywhere\;>HTTPS "
 "Everywhere ve https://noscript.net/\;>NoScript eklentileri kurulmuş "
-"olarak gelir. Bunun dışında bir eklenti kurmak anonim kalmanızı "
+"olarak gelir. Bunlardan başka eklentiler kurmak anonim kalmanızı "
 "engelleyebilir."
 
 #: http//localhost/faq/faq-3/

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