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

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Apr '17

03 Apr '17

commit 1febfac664bc9d6146bc074a4e7235fd4bfbce37 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 3 08:45:03 2017 +0000 Update translations for bridgedb --- bn/LC_MESSAGES/bridgedb.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po index 0510f9e..02296a2 100644 --- a/bn/LC_MESSAGES/bridgedb.po +++ b/bn/LC_MESSAGES/bridgedb.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Mahmud Numan <mahmudnuman(a)gmail.com>, 2016 +# Mahmud Numan <mahmudnuman(a)gmail.com>, 2016-2017 # Sakib Abrar <skbabrar(a)gmail.com>, 2015 # S. M. MAINUL KABIR <mainulkabirshibli(a)gmail.com>, 2015 msgid "" @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-10-26 03:05+0000\n" +"PO-Revision-Date: 2017-04-03 08:44+0000\n" "Last-Translator: Mahmud Numan <mahmudnuman(a)gmail.com>\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n" @@ -34,11 +34,11 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "দুঃখিত! আপনার অনুরোধ কার্যকর করা যাচ্ছে না।" +msgstr "দুঃখিত! আপনার অনুরোধ কার্য্যকরে সমস্যা হচ্ছে " #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "রিপোর্ট করুন" +msgstr "দূর্বলতা রিপোর্ট করুন" #: bridgedb/https/templates/base.html:82 msgid "Source Code" @@ -234,7 +234,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr " কিছু ব্রিজে IPv6 এড্রেস সুবিধা পাওয়া যায় যদিও কিছু কিছু প্লাগেবল\n ট্রান্সপোর্ট IPv6 এর সাথে যুতসই নয়।\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -252,16 +252,16 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "ব্রিজ কি ?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s ব্রিজ %s হলো রিলে কারক যা সেন্সরশীপের মায়রে বাপ করে।" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "আমাকে ভিন্ন পদ্ধতিতে ব্রিজে যুক্ত হওয়া দরকার" #: bridgedb/strings.py:108 #, python-format

1 0

[exonerator/master] Add French translation by Transifex and Lunar.
by karsten＠torproject.org 03 Apr '17

03 Apr '17

commit b9521fb608d31c1129947cc7c81b568d793660df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 3 10:02:48 2017 +0200 Add French translation by Transifex and Lunar. --- src/main/resources/ExoneraTor_fr.properties | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/main/resources/ExoneraTor_fr.properties b/src/main/resources/ExoneraTor_fr.properties new file mode 100644 index 0000000..d28d6a6 --- /dev/null +++ b/src/main/resources/ExoneraTor_fr.properties @@ -0,0 +1,51 @@ +form.explanation=Saisir une adresse IP et une date afin de savoir si l'adresse a \u00e9t\u00e9 utilis\u00e9e comme relais Tor \: +form.ip.label=Adresse IP +form.timestamp.label=Date +form.search.label=Rechercher +summary.heading=R\u00e9sum\u00e9 +summary.serverproblem.dbnoconnect.title=Probl\u00e8me de serveur +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter \u00e0 la base de donn\u00e9es. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.dbnoconnect.body.link=nous en informer +summary.serverproblem.dbempty.title=Probl\u00e8me de serveur +summary.serverproblem.dbempty.body.text=La base de donn\u00e9es semble \u00eatre vide. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.dbempty.body.link=nous en informer +summary.invalidparams.notimestamp.title=Aucune date n'a \u00e9t\u00e9 donn\u00e9e en param\u00e8tre +summary.invalidparams.notimestamp.body=D\u00e9sol\u00e9, vous devez aussi pr\u00e9ciser une date. +summary.invalidparams.noip.title=Aucune adresse IP n'a \u00e9t\u00e9 donn\u00e9e en param\u00e8tre +summary.invalidparams.noip.body=D\u00e9sol\u00e9, vous devez aussi fournir une adresse IP. +summary.invalidparams.timestamprange.title=Date hors p\u00e9riode couverte +summary.invalidparams.timestamprange.body=D\u00e9sol\u00e9, la base de donn\u00e9es ne contient aucune donn\u00e9e de %s. Veuillez choisir une date entre %s et %s. +summary.invalidparams.invalidip.title=Adresse IP invalide +summary.invalidparams.invalidip.body=D\u00e9sol\u00e9, %s n'est pas une adresse IP valide. Les formats d'adresse IP attendus sont %s ou %s. +summary.invalidparams.invalidtimestamp.title=Date invalide +summary.invalidparams.invalidtimestamp.body=D\u00e9sol\u00e9, %s n'est pas une date valide. Le format de date attendu est %s. +summary.serverproblem.nodata.title=Probl\u00e8me de serveur +summary.serverproblem.nodata.body.text=La base de donn\u00e9es ne contient aucune donn\u00e9e pour la date demand\u00e9e. Veuillez ressayer ult\u00e9rieurement. Si le probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.nodata.body.link=nous en informer +summary.negativesamenetwork.title=R\u00e9sultat n\u00e9gatif +summary.negativesamenetwork.body=Nous n'avons pas trouv\u00e9 l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. Mais nous avons trouv\u00e9 d'autres adresses IP de relais Tor dans le m\u00eame r\u00e9seau /%d aux alentours de cette date \: +summary.positive.title=R\u00e9sultat positif +summary.positive.body=Nous avons trouv\u00e9 un ou plusieurs relais Tor \u00e0 l'adresse IP %s probablement connus des clients Tor le %s ou \u00e0 un jour pr\u00e8s. +summary.negative.title=R\u00e9sultat n\u00e9gatif +summary.negative.body=Nous n'avons pas trouv\u00e9 l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. +technicaldetails.heading=D\u00e9tails techniques +technicaldetails.pre=Recherche de l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. +technicaldetails.colheader.timestamp=Date et heure (UTC) +technicaldetails.colheader.ip=Adresse(s) IP +technicaldetails.colheader.fingerprint=Empreinte +technicaldetails.colheader.nickname=Pseudonyme +technicaldetails.colheader.exit=Relais de sortie +technicaldetails.nickname.unknown=Inconnu +technicaldetails.exit.unknown=Inconnu +technicaldetails.exit.yes=Oui +technicaldetails.exit.no=Non +permanentlink.heading=Lien permanent +footer.abouttor.heading=\u00c0 propos de Tor +footer.abouttor.body.text=Tor est un projet international d\u00e9veloppant des logiciels pour anonymiser le trafic Internet en %s. Par cons\u00e9quent, si vous voyez du trafic en provenance d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plut\u00f4t que de l'op\u00e9rateur du relais. Le projet Tor et les op\u00e9rateurs de relais Tor n'ont aucune trace du trafic relay\u00e9 par le r\u00e9seau et ne peuvent donc fournir aucune information sur son origine. N'h\u00e9sitez pas \u00e0 vous %s et n'h\u00e9sitez pas \u00e0 %s pour obtenir d'avantage d'informations. +footer.abouttor.body.link1=chiffrant les paquets et en les faisant transiter par une s\u00e9rie de relais avant qu'ils n'atteignent leur destination +footer.abouttor.body.link2=renseigner d'avantage au sujet de Tor +footer.abouttor.body.link3=contacter \u00ab\u00a0The Tor Project, Inc.\u00a0\u00bb +footer.aboutexonerator.heading=\u00c0 propos d'ExoneraTor +footer.aboutexonerator.body=Le service ExoneraTor g\u00e8re une base de donn\u00e9es d'adresses IP qui ont fait partie du r\u00e9seau Tor. Il permet de savoir si un relais Tor fonctionnait pour une adresse IP donn\u00e9e \u00e0 une date pr\u00e9cise. ExoneraTor peut enregistrer plus d'une adresse IP par relais si ces derniers utilisent une adresse IP diff\u00e9rente pour se connecter \u00e0 Internet de celle utilis\u00e9e pour s'enregistrer sur le r\u00e9seau Tor. ExoneraTor enregistre \u00e9galement les dates et heures auxquelles un relais a permis de faire transiter du trafic en provenance de Tor vers Internet. +footer.trademark.text=\u00ab\u00a0Tor\u00a0\u00bb et le \u00ab\u00a0logo Oignon\u00a0\u00bb sont des %s de \u00ab\u00a0The Tor Project, Inc.\u00a0\u00bb +footer.trademark.link=marques d\u00e9pos\u00e9es

1 0

[exonerator/master] Add Swedish translation by Transifex and ln5.
by karsten＠torproject.org 03 Apr '17

03 Apr '17

commit 6d110314448d9eaa3f815195786c011bb65bb856 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 3 10:35:19 2017 +0200 Add Swedish translation by Transifex and ln5. --- src/main/resources/ExoneraTor_sv.properties | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/main/resources/ExoneraTor_sv.properties b/src/main/resources/ExoneraTor_sv.properties new file mode 100644 index 0000000..3e39c6b --- /dev/null +++ b/src/main/resources/ExoneraTor_sv.properties @@ -0,0 +1,52 @@ +form.explanation=Ange en IP-adress och ett datum f\u00f6r att f\u00e5 reda p\u00e5 om adressen anv\u00e4ndes av ett Tor-rel\u00e4\: +form.ip.label=IP-adress +form.timestamp.label=Datum +form.search.label=S\u00f6k +summary.heading=Sammanfattning +summary.serverproblem.dbnoconnect.title=Serverproblem +summary.serverproblem.dbnoconnect.body.text=Kunde inte ansluta till databasen. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.dbnoconnect.body.link=l\u00e5t oss f\u00e5 veta +summary.serverproblem.dbempty.title=Serverproblem +summary.serverproblem.dbempty.body.text=Databasen verkar vara tom. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.dbempty.body.link=l\u00e5t oss f\u00e5 veta +summary.invalidparams.notimestamp.title=Inget datum angivet +summary.invalidparams.notimestamp.body=Datum m\u00e5ste anges. +summary.invalidparams.noip.title=Ingen IP-adress angiven +summary.invalidparams.noip.body=IP-adress m\u00e5ste anges. +summary.invalidparams.timestamprange.title=Ogiltigt datum +summary.invalidparams.timestamprange.body=Databasen inneh\u00e5ller inte n\u00e5got data f\u00f6r %s. V\u00e4nligen v\u00e4lj ett datum mellan %s och %s. +summary.invalidparams.invalidip.title=Felaktig IP-adress +summary.invalidparams.invalidip.body=%s \u00e4r inte en giltig IP-adress. F\u00f6rv\u00e4ntat format p\u00e5 IP-adresser \u00e4r %s eller %s. +summary.invalidparams.invalidtimestamp.title=Ogiltigt datum. +summary.invalidparams.invalidtimestamp.body=%s \u00e4r inte ett giltigt datum. F\u00f6rv\u00e4ntat datumformat \u00e4r %s. +summary.serverproblem.nodata.title=Serverproblem +summary.serverproblem.nodata.body.text=Databasen inneh\u00e5ller inte n\u00e5got data f\u00f6r det efterfr\u00e5gade datumet. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.nodata.body.link=l\u00e5t oss f\u00e5 veta +summary.negativesamenetwork.title=Resultatet \u00e4r negativt +summary.negativesamenetwork.body=Vi kunde inte hitta IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s. Men vi hittade andra IP-adresser som anv\u00e4ndes av Tor-rel\u00e4n i samma /%d-n\u00e4tverk runt den tiden\: +summary.positive.title=Resultatet \u00e4r positivt +summary.positive.body=Vi hittade ett eller flera Tor-rel\u00e4n p\u00e5 IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s som Tor-klienter f\u00f6rmodligen k\u00e4nde till. +summary.negative.title=Resultatet \u00e4r negativt +summary.negative.body=Vi kunde inte hitta IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s. +technicaldetails.heading=Tekniska detaljer +technicaldetails.pre=Letar upp IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s. Tor-klienter kan ha valt denna eller dessa Tor-rel\u00e4n vid anslutning via Tor. +technicaldetails.colheader.timestamp=Tidsst\u00e4mpel (UTC) +technicaldetails.colheader.ip=IP adress(er) +technicaldetails.colheader.fingerprint=Identitet ("fingerprint") +technicaldetails.colheader.nickname=Namn +technicaldetails.colheader.exit=Exit-rel\u00e4 +technicaldetails.nickname.unknown=Ok\u00e4nd +technicaldetails.exit.unknown=Ok\u00e4nd +technicaldetails.exit.yes=Ja +technicaldetails.exit.no=Nej +permanentlink.heading=Permanent l\u00e4nk +footer.abouttor.heading=Om Tor +footer.abouttor.body.text=Tor \u00e4r ett internationellt mjukvaruprojekt f\u00f6r att anonymisera internettrafik genom att %s. Om du ser trafik fr\u00e5n ett Tor-rel\u00e4 s\u00e5 kommer den trafiken oftast fr\u00e5n n\u00e5gon som anv\u00e4nder sig av Tor snarare \u00e4n fr\u00e5n sj\u00e4lva rel\u00e4operat\u00f6ren. Vare sig Tor-projektet eller Tor-rel\u00e4operat\u00f6rer har n\u00e5gon historik \u00f6ver trafiken som passerar genom n\u00e4tverket och kan d\u00e4rf\u00f6r inte ge n\u00e5gon information om dess ursprung. Se till att %s och tveka inte att %s f\u00f6r ytterligare information. +footer.abouttor.body.link1=kryptera datat och skicka det genom flera hopp innan det n\u00e5r sin destination +footer.abouttor.body.link2=l\u00e4sa p\u00e5 om Tor +footer.abouttor.body.link3=kontakta Tor-projektet +footer.aboutexonerator.heading=Om ExoneraTor +footer.aboutexonerator.body=Tj\u00e4nsten ExoneraTor uppr\u00e4tth\u00e5ller en databas \u00f6ver IP-adresser som har varit en del av Tor-n\u00e4tverket. Den ger svar p\u00e5 fr\u00e5gan om det var ett Tor-rel\u00e4 som anv\u00e4nde en viss IP-adress vid ett givet datum. ExoneraTor kan komma att lagra fler \u00e4n en IP-adress per rel\u00e4 f\u00f6r rel\u00e4n som anv\u00e4nder en annan IP-adress f\u00f6r att ansluta till internet \u00e4n den som anv\u00e4ndes f\u00f6r att registrera sig i Tor-n\u00e4tverket. Huruvida ett rel\u00e4 har till\u00e5tit Tor-trafik ut mot internet vid tidpunkten eller ej lagras ocks\u00e5. +footer.trademark.text="Tor" och "Onion-loggan" \u00e4r %s av The Tor Project, Inc. +footer.trademark.link=registrerade varum\u00e4rken +

1 0

[support-portal/master] Adding initial answers for misc
by colin＠torproject.org 03 Apr '17

03 Apr '17

commit 81ab1326139c38caf5d1e80049d9bdc261cbdefc Author: Colin Childs <colin(a)torproject.org> Date: Mon Apr 3 02:39:46 2017 -0500 Adding initial answers for misc --- plain/misc.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/plain/misc.txt b/plain/misc.txt index 197e4fe..4cbb75d 100644 --- a/plain/misc.txt +++ b/plain/misc.txt @@ -1,10 +1,21 @@ Q. How is Tor different from a VPN? Q. Can I use Tor with bittorrent? - -Q. Does the Tor Project have control over onion services? +A. Using Tor with bittorrent is not recommended or supported. For further details, +please see our blog post on the subject at https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea. Q. Is using Tor illegal? +A. Q. Why did you infect my computer with malware? (CryptoLocker) +A. You have been infected with malware. The Tor Project did not create this malware. + +The Tor Project writes software that is used every day for a wide variety of purposes +by the military, journalists, law enforcement officers, activists, and many others +[https://www.torproject.org/about/torusers.html.en]. Unfortunately, the protection that our software +can provide to these groups of people can also be abused by criminals and malware authors. + +The Tor Project does not endorse, support or condone the use of our software in this way. However, +we are not able to assist directly with these cases as we did not write the malware that you +have been infected with.

1 0

[support-portal/master] Adding initial answers for mobile
by colin＠torproject.org 03 Apr '17

03 Apr '17

commit bdf618bcf8c6213005ea7da36b29eca6b493aa6a Author: Colin Childs <colin(a)torproject.org> Date: Mon Apr 3 02:19:53 2017 -0500 Adding initial answers for mobile --- plain/mobile.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plain/mobile.txt b/plain/mobile.txt index 10f27be..03bab16 100644 --- a/plain/mobile.txt +++ b/plain/mobile.txt @@ -1,8 +1,13 @@ Q. How do I run Tor on Android? +Tor on Android is provided by The Guardian Project. More information can be found at +https://guardianproject.info/apps/orbot/ and https://guardianproject.info/apps/orfox/. + +Q. Who is the Guardian Project? +The Guardian Project maintains Tor (and other applications) on Android. Q. How do I run Tor on iOS? Q. How do I run Tor on Windows Phone? +There is currently no supported method for running Tor on Windows Phone. -Q. Who is the Guardian Project?

1 0

[support-portal/master] Fix up mobile.txt
by colin＠torproject.org 03 Apr '17

03 Apr '17

commit 66d727e42fd34aa7d03391e2184062474f02ea1d Author: Colin Childs <colin(a)torproject.org> Date: Mon Apr 3 02:40:16 2017 -0500 Fix up mobile.txt --- plain/mobile.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plain/mobile.txt b/plain/mobile.txt index 03bab16..26db3d7 100644 --- a/plain/mobile.txt +++ b/plain/mobile.txt @@ -1,13 +1,13 @@ Q. How do I run Tor on Android? -Tor on Android is provided by The Guardian Project. More information can be found at +A. Tor on Android is provided by The Guardian Project. More information can be found at https://guardianproject.info/apps/orbot/ and https://guardianproject.info/apps/orfox/. Q. Who is the Guardian Project? -The Guardian Project maintains Tor (and other applications) on Android. +A. The Guardian Project maintains Tor (and other privacy applications) on Android. Q. How do I run Tor on iOS? Q. How do I run Tor on Windows Phone? -There is currently no supported method for running Tor on Windows Phone. +A. There is currently no supported method for running Tor on Windows Phone.

1 0

[stem/master] launch_tor() raisesd a ValueError when outside the main thread
by atagar＠torproject.org 02 Apr '17

02 Apr '17

commit df21cc14e22193bba5cd64f91fbd71a02bcd42c5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 2 14:40:17 2017 -0700 launch_tor() raisesd a ValueError when outside the main thread When outside the main thread signal raises... ValueError: signal only works in main thread To account for this doing two things... * If the user doesn't specify a timeout then dropping it when outside the main thread to avoid erroring. This is similar to what we do on Windows (which doesn't support signal either). * If the user explicitly specifies a timeout then providing a more useful error message. Caught thanks to an anonymous user. --- docs/change_log.rst | 1 + stem/process.py | 13 +++++++++++-- test/integ/process.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 2c18560..d5c9755 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -45,6 +45,7 @@ The following are only available within Stem's `git repository * **Controller** + * :func:`~stem.process.launch_tor` raised a ValueError if invoked when outside the main thread * Renamed :class:`~stem.response.events.ConnectionBandwidthEvent` type attribute to conn_type to avoid conflict with parent class (:trac:`21774`) * Added the GUARD_WAIT :data:`~stem.CircStatus` (:spec:`6446210`) * Unable to use cookie auth when path includes wide characters (chinese, japanese, etc) diff --git a/stem/process.py b/stem/process.py index ec10b21..3cab463 100644 --- a/stem/process.py +++ b/stem/process.py @@ -23,6 +23,7 @@ import re import signal import subprocess import tempfile +import threading import stem.prereq import stem.util.str_tools @@ -47,8 +48,8 @@ def launch_tor(tor_cmd = 'tor', args = None, torrc_path = None, completion_perce default, but if you have a 'Log' entry in your torrc then you'll also need 'Log NOTICE stdout'. - Note: The timeout argument does not work on Windows, and relies on the global - state of the signal module. + Note: The timeout argument does not work on Windows or when outside the + main thread, and relies on the global state of the signal module. .. versionchanged:: 1.6.0 Allowing the timeout argument to be a float. @@ -74,6 +75,14 @@ def launch_tor(tor_cmd = 'tor', args = None, torrc_path = None, completion_perce """ if stem.util.system.is_windows(): + if timeout is not None and timeout != DEFAULT_INIT_TIMEOUT: + raise OSError('You cannot launch tor with a timeout on Windows') + + timeout = None + elif threading.current_thread().__class__.__name__ != '_MainThread': + if timeout is not None and timeout != DEFAULT_INIT_TIMEOUT: + raise OSError('Launching tor with a timeout can only be done in the main thread') + timeout = None # sanity check that we got a tor binary diff --git a/test/integ/process.py b/test/integ/process.py index 3f7ac65..66f2018 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -9,6 +9,7 @@ import re import shutil import subprocess import tempfile +import threading import time import unittest @@ -275,6 +276,49 @@ class TestProcess(unittest.TestCase): self.assertTrue('Configuration was valid' in output) @only_run_once + def test_can_run_multithreaded(self): + """ + Our launch_tor() function uses signal to support its timeout argument. + This only works in the main thread so ensure we give a useful message when + it isn't. + """ + + # Tries running tor in another thread with the given timeout argument. This + # issues an invalid torrc so we terminate right away if we get to the point + # of actually invoking tor. + # + # Returns None if launching tor is successful, and otherwise returns the + # exception we raised. + + def launch_async_with_timeout(timeout_arg): + raised_exc, tor_cmd = [None], test.runner.get_runner().get_tor_command() + + def short_launch(): + try: + stem.process.launch_tor_with_config({'SocksPort': 'invalid', 'DataDirectory': self.data_directory}, tor_cmd, 100, None, timeout_arg) + except Exception as exc: + raised_exc[0] = exc + + t = threading.Thread(target = short_launch) + t.start() + t.join() + + if 'Invalid SocksPort/SocksListenAddress' in str(raised_exc[0]): + return None # got to the point of invoking tor + else: + return raised_exc[0] + + exc = launch_async_with_timeout(0.5) + self.assertEqual(OSError, type(exc)) + self.assertEqual('Launching tor with a timeout can only be done in the main thread', str(exc)) + + # We should launch successfully if no timeout is specified or we specify it + # to be 'None'. + + self.assertEqual(None, launch_async_with_timeout(None)) + self.assertEqual(None, launch_async_with_timeout(stem.process.DEFAULT_INIT_TIMEOUT)) + + @only_run_once @patch('stem.version.get_system_tor_version', Mock(return_value = stem.version.Version('0.0.0.1'))) def test_launch_tor_with_config_via_file(self): """

1 0

[tor-messenger-build/master] Hide the timestamp and account from message selection templates
by arlo＠torproject.org 02 Apr '17

02 Apr '17

commit ce74e0c031df621fe7daf3318b81325b07890041 Author: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Fri Mar 31 16:00:00 2017 -0400 Hide the timestamp and account from message selection templates * And set use_utc_timezone to false. * Closes trac 21736 and 17619 --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 31 +++++------ ...c-21634-Autologin-default-should-be-false.patch | 4 +- ...Support-Special-Characters-input-prompt-o.patch | 4 +- ...Better-error-reporting-for-failed-outgoin.patch | 4 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +- ...-XMPP-createConversation-should-handle-in.patch | 4 +- .../0008-XMPP-in-band-registration.patch | 4 +- .../instantbird/0009-Remove-search-from-UI.patch | 4 +- .../0010-Add-Tor-Messenger-branding.patch | 4 +- projects/instantbird/0011-Account-picture.patch | 4 +- .../0012-Modify-protocol-defaults.patch | 4 +- .../instantbird/0013-Modify-IRC-defaults.patch | 4 +- projects/instantbird/0014-Modify-themes.patch | 4 +- .../instantbird/0015-Modify-XMPP-defaults.patch | 4 +- projects/instantbird/0016-Remove-logging-UI.patch | 4 +- projects/instantbird/0017-Cert-override.patch | 4 +- .../0018-Display-all-traffic-over-Tor.patch | 4 +- .../instantbird/0019-Trac-17480-Content-sink.patch | 4 +- .../0020-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 4 +- ...Contact-list-entries-should-adapt-their-h.patch | 4 +- ...1187281-Only-show-close-button-on-Windows.patch | 4 +- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 4 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 +- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 +- ...517-Use-different-color-for-Add-Exception.patch | 4 +- ...21736-Hide-account-timestamp-from-message.patch | 64 ++++++++++++++++++++++ projects/instantbird/config | 1 + 30 files changed, 133 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56768c1..aa9197d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Tor Messenger 0.4.0b3 -- * All Platforms * Add some missing localization for Twitter's actions + * Trac 21736: Hide the timestamp and account from message selection templates Tor Messenger 0.4.0b2 -- March 31, 2017 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index fc8da85..9a72cd6 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,17 +1,17 @@ -From fb5f313361c15285152d6e3f25a428e60f8d1679 Mon Sep 17 00:00:00 2001 +From 8db9ea380fb0d2b54bb3dd6d6003532d13d2c2bf Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/27] Set Tor Messenger preferences +Subject: [PATCH 01/28] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 425 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 403 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 424 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 402 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a397017..7b91410f9 100644 +index b7a397017..89593abeb 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -1,3 +1,54 @@ +@@ -1,3 +1,53 @@ +/** + * This file is divded into three section, + * @@ -62,11 +62,10 @@ index b7a397017..7b91410f9 100644 +pref("app.update.download.backgroundInterval", 60); + + -+ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@@ -28,7 +79,7 @@ pref("general.autoScroll", true); +@@ -28,7 +78,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -75,7 +74,7 @@ index b7a397017..7b91410f9 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +117,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +116,7 @@ pref("extensions.mintrayr.singleClickRestore", false); // Whether message related sounds should be played at all. If this is enabled // then the more specific prefs are checked as well. @@ -84,7 +83,7 @@ index b7a397017..7b91410f9 100644 // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. pref("messenger.options.playSounds.outgoing", true); -@@ -142,26 +193,23 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +192,23 @@ pref("app.update.staging.enabled", true); // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example @@ -116,7 +115,7 @@ index b7a397017..7b91410f9 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +250,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -202,7 +249,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -125,7 +124,7 @@ index b7a397017..7b91410f9 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -222,10 +270,10 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +269,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -138,7 +137,7 @@ index b7a397017..7b91410f9 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -244,10 +292,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC +@@ -244,10 +291,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); @@ -166,7 +165,7 @@ index b7a397017..7b91410f9 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -259,13 +321,13 @@ pref("network.protocol-handler.expose.https", true); +@@ -259,13 +320,13 @@ pref("network.protocol-handler.expose.https", true); // expose javascript: so that message themes can use it. // javascript: links inside messages are filtered out. @@ -183,7 +182,7 @@ index b7a397017..7b91410f9 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +362,333 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +361,333 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -353,7 +352,7 @@ index b7a397017..7b91410f9 100644 +// bug 18950 for more details. +pref("browser.reader.detectedFirstArticle", true); +pref("reader.parse-on-load.enabled", false); -+pref("privacy.use_utc_timezone", true); ++pref("privacy.use_utc_timezone", false); // TM + +// Third party stuff +//pref("network.cookie.cookieBehavior", 1); // TM diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index c090c07..a428a00 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,7 +1,7 @@ -From 5dc74f402183115a4d60d69c96bcd770f794c014 Mon Sep 17 00:00:00 2001 +From 4b44c103a9b4c7a35ce9157bb671a2937a0111e1 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/27] Trac 21634: Autologin default should be false +Subject: [PATCH 02/28] Trac 21634: Autologin default should be false --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index f1f9468..af29c25 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ -From bee69d70cfbb69967da3a6457d232177d70af26b Mon Sep 17 00:00:00 2001 +From 5eec6f52c78cb09a1e4c4501a95e34ffe21d0d14 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/27] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/28] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 487755b..0a42f29 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ -From 31c4a6075ae676f0e2600efe20aad0ca79228d29 Mon Sep 17 00:00:00 2001 +From 81f299a5113a5fd7261bdfffca05be8ecec71bbd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/27] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/28] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index 4c877dd..18d684e 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ -From c683744608becc6e1cb8086f64f878db4b03b293 Mon Sep 17 00:00:00 2001 +From 610d64905425755c3602d33ba36af5435dbc2631 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/27] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/28] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 3 +- diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index 94c296b..c6e5d1c 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ -From d704d7f249b75e419b967087364ff360fd634762 Mon Sep 17 00:00:00 2001 +From eccb5b4b6c09fa2fd8f6da0bfa915afe79ebddcf Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/27] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/28] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 7a141df..23a8716 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ -From 53631ac27f28be5098056a37adb490471dc1140c Mon Sep 17 00:00:00 2001 +From 22d64ca4c9ec08609cdcf78ed6b969522217c256 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/27] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/28] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch b/projects/instantbird/0008-XMPP-in-band-registration.patch index 3927919..096e648 100644 --- a/projects/instantbird/0008-XMPP-in-band-registration.patch +++ b/projects/instantbird/0008-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ -From 75174e806cd046a2c975ecbae8ad6f7fdae8fba9 Mon Sep 17 00:00:00 2001 +From a1de4a4aaedf227494a80f91bfa8edbf15547e49 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 08/27] XMPP in-band registration +Subject: [PATCH 08/28] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch b/projects/instantbird/0009-Remove-search-from-UI.patch index 2e20a8e..7e716d1 100644 --- a/projects/instantbird/0009-Remove-search-from-UI.patch +++ b/projects/instantbird/0009-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ -From 8a3f6e91fac7248282712ed1f33bacfa93b9c7b1 Mon Sep 17 00:00:00 2001 +From 1416efe7c0d089fa0782f8234c66096f5d5e9520 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 09/27] Remove search from UI +Subject: [PATCH 09/28] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch index 399d409..d1f733f 100644 --- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ -From 420c326c8c91fd204cbd530c522a94b8849cdc30 Mon Sep 17 00:00:00 2001 +From 1368d7678fbfb6dc5fbd09a70dbf328f847d5e1d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 10/27] Add Tor Messenger branding +Subject: [PATCH 10/28] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0011-Account-picture.patch b/projects/instantbird/0011-Account-picture.patch index 5853b64..88907e6 100644 --- a/projects/instantbird/0011-Account-picture.patch +++ b/projects/instantbird/0011-Account-picture.patch @@ -1,7 +1,7 @@ -From 479dd68a7f055242dd6aa3a16d800b4700bd8bc3 Mon Sep 17 00:00:00 2001 +From 70b53480506595d02d5b0ede56501ef9ec48919f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 11/27] Account picture +Subject: [PATCH 11/28] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch b/projects/instantbird/0012-Modify-protocol-defaults.patch index 7cc9fda..79ca55e 100644 --- a/projects/instantbird/0012-Modify-protocol-defaults.patch +++ b/projects/instantbird/0012-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ -From a79fddb0057e69473da02837b057f4ae57aba915 Mon Sep 17 00:00:00 2001 +From 2d8c5549ba5c0aa71a166bc504c431edab8f755f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 12/27] Modify protocol defaults +Subject: [PATCH 12/28] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch b/projects/instantbird/0013-Modify-IRC-defaults.patch index dd4c4f4..1ae35e4 100644 --- a/projects/instantbird/0013-Modify-IRC-defaults.patch +++ b/projects/instantbird/0013-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ -From 0c3d7d55604044a29f03084b70b20945ae116c0f Mon Sep 17 00:00:00 2001 +From 37f684af18a7d1926960090bb3148d520312abbd Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 13/27] Modify IRC defaults +Subject: [PATCH 13/28] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0014-Modify-themes.patch b/projects/instantbird/0014-Modify-themes.patch index 3aa77b8..1cc0b5e 100644 --- a/projects/instantbird/0014-Modify-themes.patch +++ b/projects/instantbird/0014-Modify-themes.patch @@ -1,7 +1,7 @@ -From 9901bceb26952e7680ae3c43561e69e08bbe0791 Mon Sep 17 00:00:00 2001 +From 4fb4d944d10666356408cbb222b38344496dc71a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 14/27] Modify themes +Subject: [PATCH 14/28] Modify themes * theme extension updateh diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch b/projects/instantbird/0015-Modify-XMPP-defaults.patch index d08cf65..d7c7579 100644 --- a/projects/instantbird/0015-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ -From 95f97927c7c987e597aaaf7896b372672a7d635d Mon Sep 17 00:00:00 2001 +From 7c0ab255fb151bf52479c6b4a6f9fe8d423155ac Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 15/27] Modify XMPP defaults +Subject: [PATCH 15/28] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0016-Remove-logging-UI.patch b/projects/instantbird/0016-Remove-logging-UI.patch index 7188405..19d1145 100644 --- a/projects/instantbird/0016-Remove-logging-UI.patch +++ b/projects/instantbird/0016-Remove-logging-UI.patch @@ -1,7 +1,7 @@ -From cecec905070c50b4a1a659154e5e241e47081734 Mon Sep 17 00:00:00 2001 +From 2429558476e6e13af0a38789111e5b9c0494d73a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 16/27] Remove logging UI +Subject: [PATCH 16/28] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0017-Cert-override.patch b/projects/instantbird/0017-Cert-override.patch index ec14ea7..7a7f6ef 100644 --- a/projects/instantbird/0017-Cert-override.patch +++ b/projects/instantbird/0017-Cert-override.patch @@ -1,7 +1,7 @@ -From d58eea036a12d99f43f0c1f27482a6da93853d72 Mon Sep 17 00:00:00 2001 +From 655a4f263afff106dc087fac917ae56c5720035b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 17/27] Cert override +Subject: [PATCH 17/28] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch index 2ea21b5..c319138 100644 --- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ -From bbb7c86f99460d9205cd215959f0dee1d1b439a7 Mon Sep 17 00:00:00 2001 +From d5874c98daf8d4e7304876cd6fa6083c54c0c644 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 18/27] Display all traffic over Tor +Subject: [PATCH 18/28] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch b/projects/instantbird/0019-Trac-17480-Content-sink.patch index 020ae83..e9ab1ee 100644 --- a/projects/instantbird/0019-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ -From ee33181a286627076114668d5173a170d0e46066 Mon Sep 17 00:00:00 2001 +From 30751b0288d46103956b395e68b906e5e4e40bfe Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 19/27] Trac 17480: Content sink +Subject: [PATCH 19/28] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 33 ++++++--------------------------- diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch index 9f35cf8..86a4dbb 100644 --- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ -From 95c1c1ae542c19accfcfb8e00a4053d427e7116a Mon Sep 17 00:00:00 2001 +From 0a32b351472debfa5a80309eec7037889725164a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 20/27] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 20/28] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + diff --git a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 46b45e5..e61301e 100644 --- a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,7 +1,7 @@ -From a4506bc5184ef5b27fc0fe6cf563cf4ae4e60d76 Mon Sep 17 00:00:00 2001 +From 57df7563fb512450b491f743a7cf070caaf63e6f Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 21/27] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 21/28] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index e4580b1..b3548b6 100644 --- a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,7 +1,7 @@ -From fb88d4775ad60abac118db70b550329e5a50aaf6 Mon Sep 17 00:00:00 2001 +From 366aa6588bf29cb0ecd1b63177a95d51fd803962 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 -Subject: [PATCH 22/27] Bug 954368 - Contact list entries should adapt their +Subject: [PATCH 22/28] Bug 954368 - Contact list entries should adapt their height to the actual font size. r=florian --HG-- diff --git a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch index dfe5c7b..e8f2b59 100644 --- a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,7 +1,7 @@ -From c841f414adabbe759f9aa2b3c99c306480958cc2 Mon Sep 17 00:00:00 2001 +From a7a2bff864f3e6a79062dd2da95c0464c818d45e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 -Subject: [PATCH 23/27] Bug 1187281 - Only show "close" button on Windows +Subject: [PATCH 23/28] Bug 1187281 - Only show "close" button on Windows --- im/content/accounts.xul | 2 ++ diff --git a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 4ae030a..c5f3582 100644 --- a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,7 +1,7 @@ -From 88cf8f20c8e2fc88c1ccad38ce0d829f2b32bf96 Mon Sep 17 00:00:00 2001 +From ec5d00df9f1e5d5f00e239e57bbf730fb280aa65 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep(a)gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 -Subject: [PATCH 24/27] Bug 1316000 - Remove old Yahoo! Messenger support. +Subject: [PATCH 24/28] Bug 1316000 - Remove old Yahoo! Messenger support. r=aleth --- diff --git a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 730442f..5a44508 100644 --- a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,7 +1,7 @@ -From 64be3bc7ee42bf7579da76f42b5f4d3c069e77bf Mon Sep 17 00:00:00 2001 +From 8479e9cddfebf6cde81f3ca0be615da48bb923a8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 1 Dec 2016 13:25:42 -0800 -Subject: [PATCH 25/27] Bug 1321641 - Use built-in functions instead of an svg +Subject: [PATCH 25/28] Bug 1321641 - Use built-in functions instead of an svg for bubbles filter --- diff --git a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 00db633..cc974ba 100644 --- a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,7 +1,7 @@ -From 1535a81698fffa329e15c285c4feb433c134434b Mon Sep 17 00:00:00 2001 +From c3d0c1e82812698d6da4a5890860fd1b43e7fcbd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 1 Dec 2016 14:34:51 -0800 -Subject: [PATCH 26/27] Bug 1321420 - Add a pref to disable JavaScript in +Subject: [PATCH 26/28] Bug 1321420 - Add a pref to disable JavaScript in browser requests --- diff --git a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch index 84f166a..c063927 100644 --- a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,7 +1,7 @@ -From 87fd1c478b2bd75333c68a3082d02fd2ac8ef03f Mon Sep 17 00:00:00 2001 +From d8da579110668bc37caf42e9e8e88e66fb3aa566 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Tue, 27 Dec 2016 08:31:36 +0700 -Subject: [PATCH 27/27] Trac 17517 - Use different color for Add Exception +Subject: [PATCH 27/28] Trac 17517 - Use different color for Add Exception --- im/content/accounts.css | 4 ++++ diff --git a/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch new file mode 100644 index 0000000..1546102 --- /dev/null +++ b/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch @@ -0,0 +1,64 @@ +From ef9ba3773fa442dd6b0d1b60056a2f07940cdc6c Mon Sep 17 00:00:00 2001 +From: Vu Quoc Huy <huyvq.c633(a)gmail.com> +Date: Sun, 2 Apr 2017 13:07:09 -0400 +Subject: [PATCH 28/28] Trac 21736 - Hide account/timestamp from message + +--- + chat/modules/imThemes.jsm | 9 ++++----- + im/app/profile/all-instantbird.js | 5 +++++ + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/chat/modules/imThemes.jsm b/chat/modules/imThemes.jsm +index be6026c07..ad822cd86 100644 +--- a/chat/modules/imThemes.jsm ++++ b/chat/modules/imThemes.jsm +@@ -892,8 +892,7 @@ SelectedMessage.prototype = { + try { + let prefBranch = + Services.prefs.getBranch("messenger.conversations.selections."); +- return prefBranch.getComplexValue(aName, +- Ci.nsIPrefLocalizedString).data; ++ return prefBranch.getCharPref(aName); + } catch(e) { + return aDefault; + } +@@ -902,17 +901,17 @@ SelectedMessage.prototype = { + if (msg.system) { + replacements = statusReplacements; + html = getLocalizedPrefWithDefault("systemMessagesTemplate", +- "%time% - %message%"); ++ ""); + } + else { + replacements = messageReplacements; + if (/^(<[^>]+>)*\/me /.test(msg.displayMessage)) { + html = getLocalizedPrefWithDefault("actionMessagesTemplate", +- "%time% * %sender% %message%"); ++ ""); + } + else { + html = getLocalizedPrefWithDefault("contentMessagesTemplate", +- "%time% - %sender%: %message%"); ++ ""); + } + } + +diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js +index 89593abeb..3b31c61ee 100644 +--- a/im/app/profile/all-instantbird.js ++++ b/im/app/profile/all-instantbird.js +@@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); + // background (in seconds) + pref("app.update.download.backgroundInterval", 60); + ++// Hide the timestamp and account from message selection templates ++pref("messenger.conversations.selections.actionMessagesTemplate", "%message%"); ++pref("messenger.conversations.selections.contentMessagesTemplate", "%message%"); ++pref("messenger.conversations.selections.systemMessagesTemplate", "%message%"); ++ + + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this +-- +2.12.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index e9f03d2..a49bb7e 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -89,6 +89,7 @@ input_files: - filename: 0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch - filename: 0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch - filename: 0027-Trac-17517-Use-different-color-for-Add-Exception.patch + - filename: 0028-Trac-21736-Hide-account-timestamp-from-message.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0

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

02 Apr '17

commit 6753613721322c74325340598f1bbe085aeb289d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 2 18:48:09 2017 +0000 Update translations for tor-browser-manual --- da/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/da.po b/da/da.po index a86ffdd..9fce074 100644 --- a/da/da.po +++ b/da/da.po @@ -908,7 +908,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" -msgstr "" +msgstr "Lær hvordan du beskytter dine data med Tor Browser og HTTPS" #: secure-connections.page:12 msgid "Secure Connections"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 02 Apr '17

02 Apr '17

commit 9bd2c9d527e2439c10fd56faeb8e6c9a02515440 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 2 13:17:58 2017 +0000 Update translations for tails-greeter-2 --- ca/ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 60e1889..3bbd45f 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: icc <mail(a)koopic.net>, 2016\n" +"Last-Translator: Jaume Zaragoza <retrasado.man(a)gmail.com>, 2017\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -130,11 +130,11 @@ msgstr "Desar paràmetres de llengua i regió" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Llengua" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Disposició del teclat" #: ../data/greeter.ui.h:27 msgid "_Formats"

1 0