- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'twstrike/options_test'
by nickm＠torproject.org 20 Jan '16

20 Jan '16

commit ae3d2a93f0cbf05803d358b2e86de1f79f103669 Merge: f557a7f 32946e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 20:14:18 2016 -0500 Merge remote-tracking branch 'twstrike/options_test' src/test/test_options.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[snowflake/master] Use chan struct{} instead
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit dcb901e4086636b3ed3248096021f23bb4363cda Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jan 19 13:41:19 2016 -0800 Use chan struct{} instead * Similar to a77ae6b771e5550b3a5370f7b1f2c0e434f4e9eb. --- server/snowflake.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/snowflake.go b/server/snowflake.go index 88eecca..1da419f 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -100,12 +100,12 @@ func datachannelHandler(conn *webRTCConn) { } // Create a PeerConnection from an SDP offer. Blocks until the gathering of ICE -// candidates is complete and and answer is available in LocalDescription. +// candidates is complete and the answer is available in LocalDescription. // Installs an OnDataChannel callback that creates a webRTCConn and passes it to // datachannelHandler. func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.Configuration) (*webrtc.PeerConnection, error) { errChan := make(chan error) - answerChan := make(chan *webrtc.SessionDescription) + answerChan := make(chan struct{}) pc, err := webrtc.NewPeerConnection(config) if err != nil { @@ -115,7 +115,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. panic("OnNegotiationNeeded") } pc.OnIceComplete = func() { - answerChan <- pc.LocalDescription() + answerChan <- struct{}{} } pc.OnDataChannel = func(dc *data.Channel) { log.Println("OnDataChannel") @@ -170,7 +170,11 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. case err = <-errChan: pc.Close() return nil, err - case <-answerChan: + case _, ok := <-answerChan: + if !ok { + pc.Close() + return nil, fmt.Errorf("Failed gathering ICE candidates.") + } } return pc, nil

1 0

[snowflake/master] begin appengine rendezvous component - domain fronting works,
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit e4e068640f26bc070199bc9d7ba661bb14d2e25a Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Jan 18 10:53:22 2016 -0800 begin appengine rendezvous component - domain fronting works, although it just reflects the offer. next step is to retrieve browser proxy answer (#1) --- client/meek-webrtc.go | 19 +++++++++---- client/snowflake.go | 13 ++++++--- rendezvous/app.yaml | 10 +++++++ rendezvous/config.go | 16 +++++++++++ rendezvous/snowflake-reg.go | 65 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 10 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index d783781..927d4bf 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -5,6 +5,7 @@ package main import ( "bytes" "io/ioutil" + "log" "net/http" "net/url" @@ -31,8 +32,9 @@ func NewRequestInfo(meekUrl string, front string) *RequestInfo { return nil } info.URL = requestUrl - info.Host = info.URL.Host - info.URL.Host = front + info.Host = front + // info.URL.Host = front + // info.Host = info.URL.Host return info } @@ -57,13 +59,13 @@ func NewMeekChannel(info *RequestInfo) *MeekChannel { // Do an HTTP roundtrip using the payload data in buf. func (m *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { - req, err := http.NewRequest("POST", m.info.URL.String(), bytes.NewReader(buf)) + // Compose an innocent looking request. + req, err := http.NewRequest("POST", m.info.Host+"/reg/123", bytes.NewReader(buf)) if nil != err { return nil, err } - if "" != m.info.Host { - req.Host = m.info.Host - } + // Set actually desired target host. + req.Host = m.info.URL.String() // req.Header.Set("X-Session-Id", m.info.SessionID) return m.transport.RoundTrip(req) } @@ -78,7 +80,12 @@ func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( return nil, err } defer resp.Body.Close() + log.Println("MeekChannel Response: ", resp) body, err := ioutil.ReadAll(resp.Body) + if nil != err { + return nil, err + } + log.Println("MeekChannel Body: ", string(body)) answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } diff --git a/client/snowflake.go b/client/snowflake.go index b42b17d..7da1e15 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -25,8 +25,9 @@ import ( // Hard-coded meek signalling channel for now. // TODO: expose as param const ( - MEEK_URL = "not implemented yet" - FRONT_DOMAIN = "www.google.com" + MEEK_URL = "snowflake-reg.appspot.com" + FRONT_DOMAIN = "https://www.google.com" + // FRONT_DOMAIN = "https://www.google.com" ) var ptInfo pt.ClientInfo @@ -187,7 +188,11 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( // if nil == answer { // log.Printf("No answer received from meek channel.") // } else { - // signalChan <- answer + // // TODO: Once this is correct, uncomment and remove copy-paste + // // signalling. + // log.Println("Recieved answer from Meek channel: \n", + // answer.Serialize()) + // // signalChan <- answer // } if offerURL != "" { answer, err := sendOfferHTTP(offerURL, offer) @@ -207,7 +212,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( pc.Close() return nil, fmt.Errorf("no answer received") } - log.Printf("got answer %s", answer.Serialize()) + log.Printf("Received Answer: %s", answer.Serialize()) err = pc.SetRemoteDescription(answer) if err != nil { pc.Close() diff --git a/rendezvous/README.md b/rendezvous/README.md new file mode 100644 index 0000000..e69de29 diff --git a/rendezvous/app.yaml b/rendezvous/app.yaml new file mode 100644 index 0000000..14fcf0a --- /dev/null +++ b/rendezvous/app.yaml @@ -0,0 +1,10 @@ +# override this with appcfg.py -A $YOUR_APP_ID +application: snowflake-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /.* + script: _go_app + secure: always diff --git a/rendezvous/config.go b/rendezvous/config.go new file mode 100644 index 0000000..eabbe65 --- /dev/null +++ b/rendezvous/config.go @@ -0,0 +1,16 @@ +/* +This is the server-side code that runs on Google App Engine for the +"appspot" registration method. + +See doc/appspot-howto.txt for more details about setting up an +application, and advice on running one. + +To upload a new version: +$ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . +*/ +package snowflake_reg + +// host:port/basepath of the facilitator you want to register with +// for example, fp-facilitator.org or example.com:12345/facilitator +// https:// and /reg/ will be prepended and appended respectively. +const SNOWFLAKE_FACILITATOR = "" diff --git a/rendezvous/snowflake-reg.go b/rendezvous/snowflake-reg.go new file mode 100644 index 0000000..094612d --- /dev/null +++ b/rendezvous/snowflake-reg.go @@ -0,0 +1,65 @@ +package snowflake_reg + +import ( + // "io" + "io/ioutil" + "log" + "net" + "net/http" + "path" + + // "appengine" + // "appengine/urlfetch" +) + +// This is an intermediate step - a basic hardcoded appengine rendezvous +// to a single browser snowflake. + +var snowflakeProxy = "" + +func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte("User-agent: *\nDisallow:\n")) +} + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte(remoteAddr)) +} + +/* +Expects a WebRTC SDP offer in the Request to give to an assigned +snowflake proxy, which responds with the SDP answer to be sent in +the HTTP response back to the client. +*/ +func regHandler(w http.ResponseWriter, r *http.Request) { + // TODO: Maybe don't pass anything on path, since it will always be bidirectional + dir, _ := path.Split(path.Clean(r.URL.Path)) + if dir != "/reg/" { + http.NotFound(w, r) + return + } + body, err := ioutil.ReadAll(r.Body) + if nil != err { + return + log.Println("Invalid data.") + } + + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real facilitator which matches clients and snowflake proxies. + w.Write(body) +} + +func init() { + http.HandleFunc("/robots.txt", robotsTxtHandler) + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) + // if SNOWFLAKE_FACILITATOR == "" { + // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") + // } +}

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 01950f634c52041b10c1cd22b7df20d17ca84161 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:46:14 2016 +0000 Update translations for tails-perl5lib_completed --- fr.po | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/fr.po b/fr.po index 6fc7603..ebce126 100644 --- a/fr.po +++ b/fr.po @@ -3,22 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bronner Matthieu <mat.bronner(a)hotmail.fr>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:50+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" -"Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" +"POT-Creation-Date: 2016-01-11 15:40+0100\n" +"PO-Revision-Date: 2016-01-19 20:40+0000\n" +"Last-Translator: Bronner Matthieu <mat.bronner(a)hotmail.fr>\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" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/RunningSystem.pm:139 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Erreur" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Le périphérique depuis lequel Tails fonctionne n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 675f0be7b7545df132f836a1de8ac87fcd44fc7a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:46:09 2016 +0000 Update translations for tails-perl5lib --- fr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fr.po b/fr.po index 9dd25d4..ebce126 100644 --- a/fr.po +++ b/fr.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bronner Matthieu <mat.bronner(a)hotmail.fr>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-19 20:40+0000\n" +"Last-Translator: Bronner Matthieu <mat.bronner(a)hotmail.fr>\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" @@ -19,16 +20,16 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Erreur" #: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Le périphérique depuis lequel Tails fonctionne n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit f10bac0f2c9d4ce9f7a5fb7a410881c222057d9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:45:52 2016 +0000 Update translations for tails-misc_completed --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index 4494f0e..8bf3022 100644 --- a/fr.po +++ b/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-08 15:05+0000\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-19 20:39+0000\n" "Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 3449c7233c62a673a11abc047d41e9a10d4711c2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:45:48 2016 +0000 Update translations for tails-misc --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index 4494f0e..8bf3022 100644 --- a/fr.po +++ b/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-08 15:05+0000\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-19 20:39+0000\n" "Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 3898d1e4fa3a7a8c08076c7c0e06a406a0f8b8ab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:45:27 2016 +0000 Update translations for tails-persistence-setup_completed --- fr/fr.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 9752424..28c9f9c 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-19 20:39+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -135,71 +135,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Créer un lien symbolique, dans $HOME, vers chaque fichier ou dossier se trouvant dans le dossier `dotfiles'" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Configurer le volume persistant de Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Erreur" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Le périphérique %s contient déjà un espace de stockage persistant." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Le périphérique %s n'a pas assez d'espace libre." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Le périphérique %s n'a pas d'espace de stockage persistant." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Impossible de supprimer le volume persistant pendant qu’il est utilisé. Vous devez redémarrer Tails en désactivant la persistance." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Le volume persistant est verrouillé." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Le volume persistant n'est pas monté." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Le volume persistant n’est pas accessible en lecture. Peut-être un problème de permissions ?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Le volume persistant n’est pas accessible en écriture. Peut-être a-t-il été monté en lecture seule ?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails est lancé depuis le périphérique non-USB / non-SDIO %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Le périphérique %s est un lecteur optique." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Le périphérique %s n'a pas été créé par Tails Installer." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Assistant de persistance - Terminé" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -251,32 +251,33 @@ msgstr "La phrase de passe ne peut pas être vide" msgid "Passphrases do not match" msgstr "Les phrases de passe ne concordent pas" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Échec" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montage de la partition persistante de Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "La partition persistante de Tails sera montée." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Correction des permissions du volume persistant." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Les permissions du volume persistant vont être corrigées." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Création..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Création du volume persistant..." @@ -326,10 +327,10 @@ msgstr "Le volume persistant %s (%s), sur le périphérique <b>%s %s</b>, sera s msgid "Delete" msgstr "Suppression" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Suppression..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Suppression du volume persistant..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 362802385b94bf6f4eab0712169634fb5bf1744d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:45:22 2016 +0000 Update translations for tails-persistence-setup --- fr/fr.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 9752424..28c9f9c 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-19 20:39+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -135,71 +135,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Créer un lien symbolique, dans $HOME, vers chaque fichier ou dossier se trouvant dans le dossier `dotfiles'" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Configurer le volume persistant de Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Erreur" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Le périphérique %s contient déjà un espace de stockage persistant." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Le périphérique %s n'a pas assez d'espace libre." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Le périphérique %s n'a pas d'espace de stockage persistant." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Impossible de supprimer le volume persistant pendant qu’il est utilisé. Vous devez redémarrer Tails en désactivant la persistance." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Le volume persistant est verrouillé." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Le volume persistant n'est pas monté." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Le volume persistant n’est pas accessible en lecture. Peut-être un problème de permissions ?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Le volume persistant n’est pas accessible en écriture. Peut-être a-t-il été monté en lecture seule ?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails est lancé depuis le périphérique non-USB / non-SDIO %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Le périphérique %s est un lecteur optique." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Le périphérique %s n'a pas été créé par Tails Installer." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Assistant de persistance - Terminé" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -251,32 +251,33 @@ msgstr "La phrase de passe ne peut pas être vide" msgid "Passphrases do not match" msgstr "Les phrases de passe ne concordent pas" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Échec" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montage de la partition persistante de Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "La partition persistante de Tails sera montée." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Correction des permissions du volume persistant." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Les permissions du volume persistant vont être corrigées." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Création..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Création du volume persistant..." @@ -326,10 +327,10 @@ msgstr "Le volume persistant %s (%s), sur le périphérique <b>%s %s</b>, sera s msgid "Delete" msgstr "Suppression" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Suppression..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Suppression du volume persistant..."

1 0

[nyx/master] Update *.order nyxrc options
by atagar＠torproject.org 19 Jan '16

19 Jan '16

commit ef124821cb63d6b567a589de38a55c9b01ba6c68 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 19 09:21:46 2016 -0800 Update *.order nyxrc options Good point from Derrick Oswald that trying to run nyx with our sample nyxrc errors... ValueError: The 'MAN PAGE ENTRY' entry of config entry 'features.config.order' wasn't in the enumeration (expected NAME, VALUE, VALUE_TYPE, CATEGORY, USAGE, SUMMARY, DESCRIPTION, MAN_PAGE_ENTRY, IS_SET) Options were no longer in sync with what nyx supported. Some were renamed, and a few removed. --- nyxrc.sample | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/nyxrc.sample b/nyxrc.sample index d6bc93c..03dd833 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -88,15 +88,15 @@ features.log.maxRefreshRate 300 # order # three comma separated configuration attributes, options including: # -# * Category -# * Option Name -# * Value -# * Arg Type -# * Arg Usage -# * Summary -# * Description -# * Man Page Entry -# * Is Default +# * NAME +# * VALUE +# * VALUE_TYPE +# * CATEGORY +# * USAGE +# * SUMMARY +# * DESCRIPTION +# * MAN_PAGE_ENTRY +# * IS_SET # # state.showPrivateOptions # tor provides config options of the form "__<option>" that can be dangerous @@ -109,7 +109,7 @@ features.log.maxRefreshRate 300 # file.maxLinesPerEntry # max number of lines to display for a single entry in the torrc -features.config.order Man Page Entry, Option Name, Is Default +features.config.order MAN_PAGE_ENTRY, NAME, IS_SET features.config.state.showPrivateOptions false features.config.state.showVirtualOptions false features.config.file.showScrollbars true @@ -169,10 +169,8 @@ features.graph.bw.accounting.show true # # * CATEGORY # * UPTIME -# * LISTING # * IP_ADDRESS # * PORT -# * HOSTNAME # * FINGERPRINT # * NICKNAME # * COUNTRY @@ -184,7 +182,7 @@ features.graph.bw.accounting.show true # shows ip addresses for other tor relays, dropping this information if # false -features.connection.order CATEGORY, LISTING, UPTIME +features.connection.order CATEGORY, IP_ADDRESS, UPTIME features.connection.resolveApps true features.connection.showIps true

1 0