August 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit f205547b2725e13289521f0134be919ce6c24a04 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:42 2014 +0000 Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index e5f79db..33250cd 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> -<!ENTITY torsettings.restart "Genstart"> +<!ENTITY torsettings.restartTor "Genstart Tor"> <!ENTITY torsettings.optional "Valgfri">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit be27b6078e75afb53c9476e6e837ffcbb6c54e70 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:40 2014 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index da32cfc..33250cd 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Genstart Tor"> <!ENTITY torsettings.optional "Valgfri">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit 8978f4227010fb7a7327982014ea32723072caf1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:36 2014 +0000 Update translations for tor-launcher-properties_completed --- da/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 143d876..693fae8 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. -torlauncher.please_restart_app=Genstart venligst programmet +torlauncher.tor_connection_lost=Din forbindelse til Tor-netværket er mistet. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttype torlauncher.recommended_bridge=(Anbefalet) torlauncher.connect=Tilslut +torlauncher.reconnect=Genskab forbindelse torlauncher.quit=Afslut torlauncher.quit_win=Afslut torlauncher.done=Færdig

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit 5326ae44c444c9a7fe0072a01b9ec6a41f49d734 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:33 2014 +0000 Update translations for tor-launcher-properties --- da/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 12bb8af..693fae8 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_connection_lost=Din forbindelse til Tor-netværket er mistet. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttype torlauncher.recommended_bridge=(Anbefalet) torlauncher.connect=Tilslut -torlauncher.reconnect=Reconnect +torlauncher.reconnect=Genskab forbindelse torlauncher.quit=Afslut torlauncher.quit_win=Afslut torlauncher.done=Færdig

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit 3fa5c690561a4c0292cae581337c225eb4003d8e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:06 2014 +0000 Update translations for bridgedb_completed --- da/LC_MESSAGES/bridgedb.po | 145 ++++++++++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 60 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 4143b67..777aa0a 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# autofunk78 <villum(a)autofunk.dk>, 2014 -# DavidNielsen <gnomeuser(a)gmail.com>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 +# David Nielsen <gnomeuser(a)gmail.com>, 2014 # OliverMller <theoliver(a)live.co.uk>, 2011 -# torebjornson <tore.bjornson(a)gmail.com>, 2013 +# Thomas Pryds <thomas(a)pryds.eu>, 2014 +# Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-21 19:03+0000\n" -"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-08-07 18:11+0000\n" +"Last-Translator: Thomas Pryds <thomas(a)pryds.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,19 +25,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Undskyld, noget gik galt med din anmodning." @@ -60,39 +58,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder på en gang)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Velkommen til BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "Transport TYPEs som er understøttet i øjeblikket:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Hej %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Hej min ven!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "Offentlige nøgler" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Denne email til %s blev skabt ved hjælp af regnbuer, enhjørninger og glitter %s klokken %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,14 +105,20 @@ msgid "" "\n" msgstr "BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s som kan hjælpe med at sløre dine forbindelser til Tor netværket, og dermed gøre det vanskeligere for nogen som kan se din internet trafik at bestemme at du bruger Tor.\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "Nogle broer med IPv6 adresser er også tilgængelige, men ikke alle Pluggable\nTransports understøtter IPv6.\n\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -118,96 +127,104 @@ msgid "" "\n" msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen Pluggable Transports %s hvilket måske ikke lyder så smart, men de kan stadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Hvad er broer?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s broer %s er Tor relæer som hjælper dig med at omgå censur." -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Jeg har brug for en alternativ metode til at få broer på!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s or %s." -msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende emailen fra en konto hos en af de følgende email udbydere:\n%s eller %s." +"%s, %s or %s." +msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende mailen fra en konto hos en af de følgende email-udbydere:\n%s, %s eller %s." -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mine broer virker ikke! Jeg har brug for hjælp!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Hvis Tor ikke virker for dig kan du sende en email til %s." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "Prøv at inkluderer så meget information om din sag som muligt, der i blandt: En liste af broer og Pluggable Transports du har prøvet at bruge, din Tor Browser version, hvilke beskeder Tor gav, etc." -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Her er dine bro linjer:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Find broer!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Vælg venligst brotype muligheder:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Har du brug for IPv6 adresser?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Har du brug for en %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Din browser kan ikke vise billeder korrekt." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Indtast tegnene fra billedet ovenfor..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Sådan starter du med at bruge dine broer" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "For at tilføje broer til Tor Browseren, følg instruktionerne på %s Tor\nBrowserens hjemmeside %s for at starte Tor Browser." -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Når 'Tor netværksindstillinger' vinduet popper op, klik 'Indstil' og følg guiden til den siger:" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor netværket?" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -215,52 +232,61 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Vælg 'Ja' og klik så på 'Næste'. For at konfigurere dine nye broer, kopier og indsæt brolinierne i den næste input boks. Klik til sidst 'Forbind', og så er du klar! Hvis du støder på problemer, så prøv at klikke på 'Hjælp'-knappen i 'Tor Netværksindstillinger'-guiden for at få yderligere hjælp." -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Vis denne besked." -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "Anmod almindelige broer." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Amod IPv6 broer." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Anmod om Pluggable Transport efter TYPE." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "Rapporter en fejl" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "Kildekode" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Ændringer" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "Kontakt" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "Ups, vi står i lort til halsen" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "Der er i øjeblikket ingen tilgængelige broer..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -301,28 +327,27 @@ msgstr "Tilføj nu %s broer til Tor Browseren %s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sB%sare giv mig bridges!" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Advancerede indstillinger" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Nej" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "ingen" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "%sJ%sa!" @@ -330,7 +355,7 @@ msgstr "%sJ%sa!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "%sH%sent Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit d9157c5c25db3ec7ad2f0c63fa83b351191ff3f4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 18:15:02 2014 +0000 Update translations for bridgedb --- da/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index e74f8f5..777aa0a 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ # Christian Villum <villum(a)autofunk.dk>, 2014 # David Nielsen <gnomeuser(a)gmail.com>, 2014 # OliverMller <theoliver(a)live.co.uk>, 2011 +# Thomas Pryds <thomas(a)pryds.eu>, 2014 # Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 msgid "" 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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-08-07 18:11+0000\n" +"Last-Translator: Thomas Pryds <thomas(a)pryds.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,7 +146,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende mailen fra en konto hos en af de følgende email-udbydere:\n%s, %s eller %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!"

1 0

[orbot/master] Notification fix and change in finding existing process
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit c517d0fcee8ca576891f8eb20cac61cad5f34287 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 11:54:31 2014 -0400 Notification fix and change in finding existing process - Only build expanded notification on supported platforms - If service is re-created() try to find existing process then, and don't wait for bind() from client --- src/org/torproject/android/service/TorService.java | 175 +++++++++++--------- 1 file changed, 93 insertions(+), 82 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 9f05351..ee3395a 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -237,54 +237,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst Intent intent = new Intent(TorService.this, Orbot.class); PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - // Create remote view that needs to be set as bigContentView for the notification. - RemoteViews expandedView = new RemoteViews(this.getPackageName(), - R.layout.layout_notification_expanded); - - StringBuffer sbInfo = new StringBuffer(); - - - if (notifyType == NOTIFY_ID) - expandedView.setTextViewText(R.id.text, notifyMsg); - else - { - expandedView.setTextViewText(R.id.info, notifyMsg); - - } - - if (hmBuiltNodes.size() > 0) - { - //sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n'); - - Set<String> itBuiltNodes = hmBuiltNodes.keySet(); - for (String key : itBuiltNodes) - { - Node node = hmBuiltNodes.get(key); - - if (node.ipAddress != null) - { - sbInfo.append(node.ipAddress); - - if (node.country != null) - sbInfo.append(' ').append(node.country); - - if (node.organization != null) - sbInfo.append(" (").append(node.organization).append(')'); - - sbInfo.append('\n'); - } - - } - - expandedView.setTextViewText(R.id.text2, sbInfo.toString()); - } - - expandedView.setTextViewText(R.id.title, getString(R.string.app_name)); - - // expandedView.setTextViewText(R.id.info, infoMessage.toString()); - // expandedView.setOnClickPendingIntent(R.id._tor_notificationBT, pendIntent); - expandedView.setImageViewResource(R.id.icon, icon); - if (mNotifyBuilder == null) { @@ -319,6 +271,55 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotification = mNotifyBuilder.build(); if (Build.VERSION.SDK_INT >= 16) { + + + // Create remote view that needs to be set as bigContentView for the notification. + RemoteViews expandedView = new RemoteViews(this.getPackageName(), + R.layout.layout_notification_expanded); + + StringBuffer sbInfo = new StringBuffer(); + + + if (notifyType == NOTIFY_ID) + expandedView.setTextViewText(R.id.text, notifyMsg); + else + { + expandedView.setTextViewText(R.id.info, notifyMsg); + + } + + if (hmBuiltNodes.size() > 0) + { + //sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n'); + + Set<String> itBuiltNodes = hmBuiltNodes.keySet(); + for (String key : itBuiltNodes) + { + Node node = hmBuiltNodes.get(key); + + if (node.ipAddress != null) + { + sbInfo.append(node.ipAddress); + + if (node.country != null) + sbInfo.append(' ').append(node.country); + + if (node.organization != null) + sbInfo.append(" (").append(node.organization).append(')'); + + sbInfo.append('\n'); + } + + } + + expandedView.setTextViewText(R.id.text2, sbInfo.toString()); + } + + expandedView.setTextViewText(R.id.title, getString(R.string.app_name)); + + // expandedView.setTextViewText(R.id.info, infoMessage.toString()); + // expandedView.setOnClickPendingIntent(R.id._tor_notificationBT, pendIntent); + expandedView.setImageViewResource(R.id.icon, icon); mNotification.bigContentView = expandedView; } @@ -565,8 +566,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void onCreate() { super.onCreate(); -// android.os.Debug.waitForDebugger(); - try { initBinariesAndDirectories(); @@ -577,6 +576,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst Log.e(TAG, "Error installing Orbot binaries",e); logNotice("There was an error installing Orbot binaries"); } + + mExecutor.execute(new Runnable () + { + public void run () + { + try + { + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + } + }); + } private void initBinariesAndDirectories () throws Exception @@ -971,7 +987,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private synchronized int initControlConnection (int maxTries) throws Exception, RuntimeException { int i = 0; - int controlPort = getControlPort(); + int controlPort = -1; File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); if (conn != null) @@ -1088,11 +1104,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst result = Integer.parseInt(lineParts[1]); } + bufferedReader.close(); + + //store last valid control port + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + prefs.edit().putInt("controlport", result).commit(); + } else { logNotice("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); + } @@ -1492,21 +1515,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { - mExecutor.execute(new Runnable () - { - public void run () - { - try - { - findExistingProc (); - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - } - }); return mBinder; } @@ -1798,24 +1806,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean doNetworKSleep = prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true); - if (doNetworKSleep && mBinder != null) + final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + final NetworkInfo netInfo = cm.getActiveNetworkInfo(); + + if(netInfo != null && netInfo.isConnected()) { + // WE ARE CONNECTED: DO SOMETHING + mConnectivity = true; + } + else { + // WE ARE NOT: DO SOMETHING ELSE + mConnectivity = false; + } + + if (doNetworKSleep) { - final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - final NetworkInfo netInfo = cm.getActiveNetworkInfo(); - - if(netInfo != null && netInfo.isConnected()) { - // WE ARE CONNECTED: DO SOMETHING - mConnectivity = true; - } - else { - // WE ARE NOT: DO SOMETHING ELSE - mConnectivity = false; - } - try { - mBinder.updateConfiguration("DisableNetwork", mConnectivity ? "0" : "1", false); - mBinder.saveConfiguration(); - + if (mBinder != null) + { + mBinder.updateConfiguration("DisableNetwork", mConnectivity ? "0" : "1", false); + mBinder.saveConfiguration(); + } + if (currentStatus == STATUS_ON) { if (!mConnectivity)

1 0

[orbot/master] update version to latest OpenSSL 1.0.1i
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit 888b7cddaa186be6febd514adeda659407092031 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 11:55:27 2014 -0400 update version to latest OpenSSL 1.0.1i --- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 432f6c7..bcbede2 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -78,7 +78,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.23-openssl1.0.1h"; + public static final String BINARY_TOR_VERSION = "0.2.4.23-openssl1.0.1i"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] update to latest OpenSSL 1.0.1i for important fixes
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit 113b18900dc8baf8072a126ab7551244f0f10514 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 11:55:42 2014 -0400 update to latest OpenSSL 1.0.1i for important fixes --- external/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/openssl b/external/openssl index 6b72417..2b45603 160000 --- a/external/openssl +++ b/external/openssl @@ -1 +1 @@ -Subproject commit 6b72417a00b803680edc9be214c1b3dd9dae203d +Subproject commit 2b456034457b58454aae3998a2765b6a5b9bc837

1 0

[orbot/master] don't stop Tor when service is destroyed()
by n8fr8＠torproject.org 07 Aug '14

07 Aug '14

commit 1801ec179f6bc3e7b8d68cef1df6b0e9106e5fb0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 12:11:53 2014 -0400 don't stop Tor when service is destroyed() --- src/org/torproject/android/service/TorService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ee3395a..88806ac 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -393,15 +393,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - public void onDestroy () { super.onDestroy(); logNotice("TorService is being destroyed... shutting down!"); - stopTor(); + //stopTor(); unregisterReceiver(mNetworkStateReceiver); @@ -1827,7 +1825,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.saveConfiguration(); } - if (currentStatus == STATUS_ON) + if (currentStatus != STATUS_OFF) { if (!mConnectivity) {

1 0