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

[tor/master] Merge branch 'bug21294_030_01_squashed'
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit b11f00c153dc6e107642258e1efe5a6daf641925 Merge: fc3e742 83df359 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 08:48:20 2017 -0500 Merge branch 'bug21294_030_01_squashed' changes/bug21294 | 6 ++++++ src/or/config.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

02 Feb '17

commit 125bd74db8eaf17905d4cd36fe74647947f71b6c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 13:48:11 2017 +0000 Update translations for tails-greeter-2 --- da/da.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/da/da.po b/da/da.po index cdbcdba..3a92b93 100644 --- a/da/da.po +++ b/da/da.po @@ -171,7 +171,7 @@ msgstr "Lås vedvarende lager igen" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Dit vedvarende lager er låst op. Genstart Tails for at låse det igen." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -302,6 +302,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist fejlede med returkode {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format

1 0

[tor/master] Add checks for expected log messages in test_hs_intropoint.
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 7eb7af08d942766cb8b96d2460f0b2946cf4403c Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Feb 1 18:58:06 2017 +0000 Add checks for expected log messages in test_hs_intropoint. This patch adds checks for expected log messages for failure cases of different ill-formed ESTABLISH_INTRO cell's. See: https://bugs.torproject.org/21266 --- src/test/test_hs_intropoint.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 770fff4..ea12aeb 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -146,8 +146,11 @@ test_establish_intro_wrong_purpose(void *arg) establish_intro_cell); tt_int_op(cell_len, >, 0); - /* Receive the cell */ + /* Receive the cell. Should fail. */ + setup_full_capture_of_logs(LOG_INFO); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); + expect_log_msg_containing("Rejecting ESTABLISH_INTRO on non-OR circuit."); + teardown_capture_of_logs(); tt_int_op(retval, ==, -1); done: @@ -180,7 +183,10 @@ test_establish_intro_wrong_keytype(void *arg) helper_prepare_circ_for_intro(intro_circ, circuit_key_material); /* Receive the cell. Should fail. */ + setup_full_capture_of_logs(LOG_INFO); retval = hs_intro_received_establish_intro(intro_circ, (uint8_t*)"", 0); + expect_log_msg_containing("Empty ESTABLISH_INTRO cell."); + teardown_capture_of_logs(); tt_int_op(retval, ==, -1); done: @@ -217,7 +223,10 @@ test_establish_intro_wrong_keytype2(void *arg) cell_body[0] = 42; /* Receive the cell. Should fail. */ + setup_full_capture_of_logs(LOG_INFO); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); + expect_log_msg_containing("Unrecognized AUTH_KEY_TYPE 42."); + teardown_capture_of_logs(); tt_int_op(retval, ==, -1); done: @@ -413,7 +422,10 @@ test_establish_intro_wrong_sig(void *arg) cell_body[cell_len-1]++; /* Receive the cell. Should fail. */ + setup_full_capture_of_logs(LOG_INFO); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); + expect_log_msg_containing("Failed to verify ESTABLISH_INTRO cell."); + teardown_capture_of_logs(); tt_int_op(retval, ==, -1); done:

1 0

[tor/master] Merge remote-tracking branch 'ahf/ahf/bugs/21266'
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit fc3e742b5b804c9ab12c6bd878551b03dfc24ba9 Merge: 2d2ab29 7eb7af0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 08:40:05 2017 -0500 Merge remote-tracking branch 'ahf/ahf/bugs/21266' src/test/test_hs_intropoint.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0

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

02 Feb '17

commit 9b3058aaf3cc20b0c21532c7eacd62e3f678ebe0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 11:48:14 2017 +0000 Update translations for tails-greeter-2_completed --- fr/fr.po | 174 ++++++++++++++++++++++++++++++--------------------------- fr_CA/fr_CA.po | 174 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 186 insertions(+), 162 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index bc7623b..4b31f1e 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1,14 +1,14 @@ -# Tails GDM Greeter -# Copyright (C) 2016 Tails devlopers -# This file is distributed under the same license as the tails-greeter package. -# Tails devloppers <tails(a)boum.org>, 2016. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-03 13:14+0000\n" +"POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Mortimer <doug.mortimer(a)netcourrier.com>, 2016\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" @@ -92,12 +92,25 @@ msgstr "Déguiser toutes les adresses MAC (par défaut)" msgid "Don't spoof MAC addresses" msgstr "Ne pas déguiser les adresses MAC" -#: ../data/greeter.ui.h:17 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "" +"Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " +"être connecté à un réseau" + +#: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" msgstr "Bienvenue à Tails !" #. This string will never be displayed in the 1st version of the greeter. -#: ../data/greeter.ui.h:19 +#: ../data/greeter.ui.h:21 msgctxt "" msgid "" "To get guided through Tails' settings, click on Take a Tour above" @@ -105,77 +118,83 @@ msgstr "" "Pour découvrir les paramètres de Tails, cliquez sur Visite guidée ci-" "dessus" -#: ../data/greeter.ui.h:20 +#: ../data/greeter.ui.h:22 msgid "Language & Region" msgstr "Langue et région" -#: ../data/greeter.ui.h:21 +#: ../data/greeter.ui.h:23 msgid "Default Settings" msgstr "Paramètres par défaut" -#: ../data/greeter.ui.h:22 +#: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" msgstr "Enregistrer les paramètres de langue et de région" -#: ../data/greeter.ui.h:23 +#: ../data/greeter.ui.h:25 msgid "Language" msgstr "Langue" -#: ../data/greeter.ui.h:24 +#: ../data/greeter.ui.h:26 msgid "Keyboard Layout" msgstr "Disposition du clavier" -#: ../data/greeter.ui.h:25 +#: ../data/greeter.ui.h:27 msgid "Formats" msgstr "Formats" -#: ../data/greeter.ui.h:26 +#: ../data/greeter.ui.h:28 msgid "Time Zone" msgstr "Fuseau horaire" -#: ../data/greeter.ui.h:27 +#: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" msgstr "Stockage persistant chiffré" -#: ../data/greeter.ui.h:28 +#: ../data/greeter.ui.h:30 msgid "Show Passphrase" msgstr "Afficher la phrase de passe" -#: ../data/greeter.ui.h:29 +#: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" msgstr "Configurer le stockage persistant" -#: ../data/greeter.ui.h:30 +#: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Saisir votre phrase de passe pour déverrouiller le stockage persistant" -#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798 -#: ../tailsgreeter/gui.py:962 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 +#: ../tailsgreeter/gui.py:510 msgid "Unlock" msgstr "Déverrouiller" -#: ../data/greeter.ui.h:32 +#: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" msgstr "Reverrouiller le stockage persistant" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"Votre stockage persistant est déverrouillé. Redémarrer Tails pour le " +"reverrouiller." + +#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" msgstr "Paramètres supplémentaires" -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:37 msgid "Save Additional Settings" msgstr "Enregistrer les paramètres supplémentaires" -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:38 msgid "Add an additional setting" msgstr "Ajouter un paramètre supplémentaire" -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:39 msgid "Network Configuration" msgstr "Configuration du réseau" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -185,19 +204,19 @@ msgstr "" "mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour " "travailler complètement hors ligne, vous pouvez désactiver le réseau." -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" msgstr "Se connecter directement au réseau Tor (par défaut)" -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "Configurer un pont Tor, un pare-feu ou les paramètres du mandataire" -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:43 msgid "Disable all networking" msgstr "Désactiver le réseau" -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:44 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -205,80 +224,63 @@ msgstr "" "Les paramètres par défaut sont sûrs dans la plupart des cas. Pour ajouter un" " paramètre personnalisé, appuyer sur le bouton « + » ci-dessous." -#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 +#: ../data/greeter.ui.h:45 msgid "Off (default)" msgstr "Désactivé (par défaut)" -#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715 +#: ../data/greeter.ui.h:46 msgid "On (default)" msgstr "Activé (par défaut)" -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:47 msgid "Network Connection" msgstr "Connexion réseau" -#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 +#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 msgid "Direct (default)" msgstr "Directe (par défaut)" -#: ../tailsgreeter/gui.py:456 -msgid "Shutdown" -msgstr "Extinction" +#: ../tailsgreeter/gui.py:373 +msgid "Bridge & Proxy" +msgstr "Bon et mandataire" -#: ../tailsgreeter/gui.py:462 -msgid "Start Tails" -msgstr "Démarrer Tails" +#: ../tailsgreeter/gui.py:379 +msgid "Offline" +msgstr "Hors ligne" + +#: ../tailsgreeter/gui.py:463 +msgid "Failed to relock persistent storage." +msgstr "Échec de reverrouillage du stockage persistant." -#: ../tailsgreeter/gui.py:523 +#: ../tailsgreeter/gui.py:481 +msgid "Unlocking…" +msgstr "Déverrouillage..." + +#: ../tailsgreeter/gui.py:562 msgid "Cancel" msgstr "Annuler" -#: ../tailsgreeter/gui.py:527 +#: ../tailsgreeter/gui.py:566 msgid "Add" msgstr "Ajouter" -#: ../tailsgreeter/gui.py:534 +#: ../tailsgreeter/gui.py:572 msgid "Back" msgstr "Retour" -#: ../tailsgreeter/gui.py:652 -msgid "Unlocking…" -msgstr "Déverrouillage..." - -#: ../tailsgreeter/gui.py:680 -msgid "" -"You will configure the Tor bridge and local proxy later on after connecting " -"to a network." -msgstr "" -"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " -"être connecté à un réseau" - -#: ../tailsgreeter/gui.py:720 -msgid "On" -msgstr "Activé" - -#: ../tailsgreeter/gui.py:722 -msgid "Off" -msgstr "Désactivé" - -#: ../tailsgreeter/gui.py:801 -msgid "Failed to relock persistent storage." -msgstr "Échec de reverrouillage du stockage persistant." +#: ../tailsgreeter/gui.py:658 +msgid "Shutdown" +msgstr "Extinction" -#: ../tailsgreeter/gui.py:920 -msgid "Bridge & Proxy" -msgstr "Bon et mandataire" +#: ../tailsgreeter/gui.py:664 +msgid "Start Tails" +msgstr "Démarrer Tails" -#: ../tailsgreeter/gui.py:926 -msgid "Offline" -msgstr "Hors ligne" +#: ../tailsgreeter/language.py:119 +msgid "default:LTR" +msgstr "default:LTR" -#: ../tailsgreeter/gui.py:965 -msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" -"Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré." - -#: ../tailsgreeter/persistence.py:96 +#: ../tailsgreeter/persistence.py:89 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" @@ -287,8 +289,7 @@ msgstr "" "Échec de live-persist avec le code de retour {returncode}:\n" "{stderr}" -#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163 -#: ../tailsgreeter/persistence.py:186 +#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 #, python-brace-format msgid "" "cryptsetup failed with return code {returncode}:\n" @@ -299,7 +300,18 @@ msgstr "" "{stdout}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:206 +#: ../tailsgreeter/persistence.py:154 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist a échoué avec le code de retour {returncode} :\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:168 #, python-brace-format msgid "" "umount failed with return code {returncode}:\n" diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index a4429c1..a7e7cee 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -1,14 +1,14 @@ -# Tails GDM Greeter -# Copyright (C) 2016 Tails devlopers -# This file is distributed under the same license as the tails-greeter package. -# Tails devloppers <tails(a)boum.org>, 2016. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-03 13:14+0000\n" +"POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>, 2016\n" "Language-Team: French (Canada) (https://www.transifex.com/otf/teams/1519/fr_CA/)\n" @@ -92,12 +92,25 @@ msgstr "Déguiser toutes les adresses MAC (par défaut)" msgid "Don't spoof MAC addresses" msgstr "Ne pas déguiser les adresses MAC" -#: ../data/greeter.ui.h:17 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "" +"Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " +"être connecté à un réseau" + +#: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" msgstr "Bienvenue à Tails!" #. This string will never be displayed in the 1st version of the greeter. -#: ../data/greeter.ui.h:19 +#: ../data/greeter.ui.h:21 msgctxt "" msgid "" "To get guided through Tails' settings, click on Take a Tour above" @@ -105,77 +118,83 @@ msgstr "" "Pour découvrir les paramètres de Tails, cliquez sur Visite guidée ci-" "dessus" -#: ../data/greeter.ui.h:20 +#: ../data/greeter.ui.h:22 msgid "Language & Region" msgstr "Langue et région" -#: ../data/greeter.ui.h:21 +#: ../data/greeter.ui.h:23 msgid "Default Settings" msgstr "Paramètres par défaut" -#: ../data/greeter.ui.h:22 +#: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" msgstr "Enregistrer les paramètres de langue et de région" -#: ../data/greeter.ui.h:23 +#: ../data/greeter.ui.h:25 msgid "Language" msgstr "Langue" -#: ../data/greeter.ui.h:24 +#: ../data/greeter.ui.h:26 msgid "Keyboard Layout" msgstr "Disposition du clavier" -#: ../data/greeter.ui.h:25 +#: ../data/greeter.ui.h:27 msgid "Formats" msgstr "Formats" -#: ../data/greeter.ui.h:26 +#: ../data/greeter.ui.h:28 msgid "Time Zone" msgstr "Fuseau horaire" -#: ../data/greeter.ui.h:27 +#: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" msgstr "Stockage persistant chiffré" -#: ../data/greeter.ui.h:28 +#: ../data/greeter.ui.h:30 msgid "Show Passphrase" msgstr "Afficher la phrase de passe" -#: ../data/greeter.ui.h:29 +#: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" msgstr "Configurer le stockage persistant" -#: ../data/greeter.ui.h:30 +#: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Saisir votre phrase de passe pour déverrouiller le stockage persistant" -#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798 -#: ../tailsgreeter/gui.py:962 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 +#: ../tailsgreeter/gui.py:510 msgid "Unlock" msgstr "Déverrouiller" -#: ../data/greeter.ui.h:32 +#: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" msgstr "Reverrouiller le stockage persistant" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"Votre stockage persistant est déverrouillé. Redémarrer Tails pour le " +"reverrouiller." + +#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" msgstr "Paramètres supplémentaires" -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:37 msgid "Save Additional Settings" msgstr "Enregistrer les paramètres supplémentaires" -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:38 msgid "Add an additional setting" msgstr "Ajouter un paramètre supplémentaire" -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:39 msgid "Network Configuration" msgstr "Configuration du réseau" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -185,19 +204,19 @@ msgstr "" "mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour " "travailler complètement hors ligne, vous pouvez désactiver le réseau." -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" msgstr "Se connecter directement au réseau Tor (par défaut)" -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "Configurer un pont Tor, un pare-feu ou les paramètres du mandataire" -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:43 msgid "Disable all networking" msgstr "Désactiver le réseau" -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:44 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -205,80 +224,63 @@ msgstr "" "Les paramètres par défaut sont sécuritaires dans la plupart des cas. Pour " "ajouter un paramètre personnalisé, peser sur le bouton « + » ci-dessous." -#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 +#: ../data/greeter.ui.h:45 msgid "Off (default)" msgstr "Désactivé (par défaut)" -#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715 +#: ../data/greeter.ui.h:46 msgid "On (default)" msgstr "Activé (par défaut)" -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:47 msgid "Network Connection" msgstr "Connexion réseau" -#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 +#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 msgid "Direct (default)" msgstr "Directe (par défaut)" -#: ../tailsgreeter/gui.py:456 -msgid "Shutdown" -msgstr "Extinction" +#: ../tailsgreeter/gui.py:373 +msgid "Bridge & Proxy" +msgstr "Bon et mandataire" -#: ../tailsgreeter/gui.py:462 -msgid "Start Tails" -msgstr "Démarrer Tails" +#: ../tailsgreeter/gui.py:379 +msgid "Offline" +msgstr "Hors ligne" + +#: ../tailsgreeter/gui.py:463 +msgid "Failed to relock persistent storage." +msgstr "Échec de reverrouillage du stockage persistant." -#: ../tailsgreeter/gui.py:523 +#: ../tailsgreeter/gui.py:481 +msgid "Unlocking…" +msgstr "Déverrouillage..." + +#: ../tailsgreeter/gui.py:562 msgid "Cancel" msgstr "Annuler" -#: ../tailsgreeter/gui.py:527 +#: ../tailsgreeter/gui.py:566 msgid "Add" msgstr "Ajouter" -#: ../tailsgreeter/gui.py:534 +#: ../tailsgreeter/gui.py:572 msgid "Back" msgstr "Retour" -#: ../tailsgreeter/gui.py:652 -msgid "Unlocking…" -msgstr "Déverrouillage..." - -#: ../tailsgreeter/gui.py:680 -msgid "" -"You will configure the Tor bridge and local proxy later on after connecting " -"to a network." -msgstr "" -"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " -"être connecté à un réseau" - -#: ../tailsgreeter/gui.py:720 -msgid "On" -msgstr "Activé" - -#: ../tailsgreeter/gui.py:722 -msgid "Off" -msgstr "Désactivé" - -#: ../tailsgreeter/gui.py:801 -msgid "Failed to relock persistent storage." -msgstr "Échec de reverrouillage du stockage persistant." +#: ../tailsgreeter/gui.py:658 +msgid "Shutdown" +msgstr "Extinction" -#: ../tailsgreeter/gui.py:920 -msgid "Bridge & Proxy" -msgstr "Bon et mandataire" +#: ../tailsgreeter/gui.py:664 +msgid "Start Tails" +msgstr "Démarrer Tails" -#: ../tailsgreeter/gui.py:926 -msgid "Offline" -msgstr "Hors ligne" +#: ../tailsgreeter/language.py:119 +msgid "default:LTR" +msgstr "default:LTR" -#: ../tailsgreeter/gui.py:965 -msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" -"Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré." - -#: ../tailsgreeter/persistence.py:96 +#: ../tailsgreeter/persistence.py:89 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" @@ -287,8 +289,7 @@ msgstr "" "Échec de live-persist avec le code de retour {returncode}:\n" "{stderr}" -#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163 -#: ../tailsgreeter/persistence.py:186 +#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 #, python-brace-format msgid "" "cryptsetup failed with return code {returncode}:\n" @@ -299,7 +300,18 @@ msgstr "" "{stdout}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:206 +#: ../tailsgreeter/persistence.py:154 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist a échoué avec le code de retour {returncode} :\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:168 #, python-brace-format msgid "" "umount failed with return code {returncode}:\n"

1 0

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

02 Feb '17

commit 769141dbccf0c3cc5a76975c74409bfa49696838 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 11:48:10 2017 +0000 Update translations for tails-greeter-2 --- fr/fr.po | 7 ++++++- fr_CA/fr_CA.po | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 243e2aa..4b31f1e 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -175,6 +175,8 @@ msgstr "Reverrouiller le stockage persistant" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Votre stockage persistant est déverrouillé. Redémarrer Tails pour le " +"reverrouiller." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -276,7 +278,7 @@ msgstr "Démarrer Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "default:LTR" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -305,6 +307,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist a échoué avec le code de retour {returncode} :\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index d7b0d3e..a7e7cee 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -175,6 +175,8 @@ msgstr "Reverrouiller le stockage persistant" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Votre stockage persistant est déverrouillé. Redémarrer Tails pour le " +"reverrouiller." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -276,7 +278,7 @@ msgstr "Démarrer Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "default:LTR" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -305,6 +307,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist a échoué avec le code de retour {returncode} :\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format

1 0

[stem/master] Avoid excessive recursion when reading descriptors
by atagar＠torproject.org 02 Feb '17

02 Feb '17

commit 783061dfd7e2f53fdbbc7b21757247b61a0287cd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 1 10:41:59 2017 -0800 Avoid excessive recursion when reading descriptors Interesting! Our hasattr() calls when getting descriptor attributes recurse. Not infinintely (not sure why) but several dozen times, having a huge hit on our performance. ... weird. Also making a few tweaks to speed up our extrainfo tests. We don't need to be quite so exhaustive with the time interval attributes. It's sufficient to test all attributes once, then check validation for a single attribute to avoid an n^2 assertion proliferation. Overall on my netbook this drops the extrainfo unit test runtime from 2.9s to 1.3s (55.2% faster). --- stem/descriptor/__init__.py | 21 ++++++-- test/unit/descriptor/extrainfo_descriptor.py | 81 +++++++++++++--------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index c16106d..8c31b86 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -642,22 +642,33 @@ class Descriptor(object): return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) def __getattr__(self, name): + # We can't use standard hasattr() since it calls this function, recursing. + # Doing so works since it stops recursing after several dozen iterations + # (not sure why), but horrible in terms of performance. + + def has_attr(): + try: + super(Descriptor, self).__getattribute__(name) + return True + except: + return False + # If an attribute we should have isn't present it means either... # # a. we still need to lazy load this # b. we read the whole descriptor but it wasn't present, so needs the default - if name in self.ATTRIBUTES and not hasattr(self, name): + if name in self.ATTRIBUTES and not has_attr(): default, parsing_function = self.ATTRIBUTES[name] if self._lazy_loading: try: parsing_function(self, self._entries) except (ValueError, KeyError): - try: - # despite having a validation failure check to see if we set something - return super(Descriptor, self).__getattribute__(name) - except AttributeError: + # Despite having a validation failure we might've set something. If + # not then set the default. + + if not has_attr(): setattr(self, name, _copy(default)) else: setattr(self, name, _copy(default)) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 8dc4130..79d0b5c 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -375,12 +375,10 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw test_entries = ( '', - '2012-05-03 ', '2012-05-03', '2012-05-03 12:07:60 (500 s)', - '2012-05-03 12:07:50 (500s)', '2012-05-03 12:07:50 (500 s', - '2012-05-03 12:07:50 (500 )', + '2012-05-03 12:07:50 (500s)', '2012-05-03 12:07:50 (500 s)11', '2012-05-03 12:07:50 (500 s) 277431,12089,0', '2012-05-03 12:07:50 (500 s) 277431,12089,0a,2134', @@ -495,21 +493,21 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, end_attr)) self.assertEqual(500, getattr(desc, interval_attr)) - test_entries = ( - '', - '2012-05-03 ', - '2012-05-03', - '2012-05-03 12:07:60 (500 s)', - '2012-05-03 12:07:50 (500s)', - '2012-05-03 12:07:50 (500 s', - '2012-05-03 12:07:50 (500 )', - ) + test_entries = ( + '', + '2012-05-03 ', + '2012-05-03', + '2012-05-03 12:07:60 (500 s)', + '2012-05-03 12:07:50 (500s)', + '2012-05-03 12:07:50 (500 s', + '2012-05-03 12:07:50 (500 )', + ) - for entry in test_entries: - desc_text = get_relay_extrainfo_descriptor({keyword: entry}, content = True) - desc = self._expect_invalid_attr(desc_text) - self.assertEqual(None, getattr(desc, end_attr)) - self.assertEqual(None, getattr(desc, interval_attr)) + for entry in test_entries: + desc_text = get_relay_extrainfo_descriptor({'entry-stats-end': entry}, content = True) + desc = self._expect_invalid_attr(desc_text) + self.assertEqual(None, desc.entry_stats_end) + self.assertEqual(None, desc.entry_stats_interval) def test_timestamp_interval_and_value_lines(self): """ @@ -523,35 +521,32 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw interval_attr = base_attr + '_interval' values_attr = base_attr + '_values' - test_entries = ( - ('', []), - (' ', []), - (' 50,11,5', [50, 11, 5]), - ) + desc = get_relay_extrainfo_descriptor({keyword: '2012-05-03 12:07:50 (500 s) 50,11,5'}) + self.assertEqual(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, end_attr)) + self.assertEqual(500, getattr(desc, interval_attr)) + self.assertEqual([50, 11, 5], getattr(desc, values_attr)) - for test_values, expected_values in test_entries: - desc = get_relay_extrainfo_descriptor({keyword: '2012-05-03 12:07:50 (500 s)%s' % test_values}) - self.assertEqual(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, end_attr)) - self.assertEqual(500, getattr(desc, interval_attr)) - self.assertEqual(expected_values, getattr(desc, values_attr)) + for test_value in ('', ' '): + desc = get_relay_extrainfo_descriptor({'write-history': '2012-05-03 12:07:50 (500 s)%s' % test_value}) + self.assertEqual(datetime.datetime(2012, 5, 3, 12, 7, 50), desc.write_history_end) + self.assertEqual(500, desc.write_history_interval) + self.assertEqual([], desc.write_history_values) - test_entries = ( - '', - '2012-05-03 ', - '2012-05-03', - '2012-05-03 12:07:60 (500 s)', - '2012-05-03 12:07:50 (500s)', - '2012-05-03 12:07:50 (500 s', - '2012-05-03 12:07:50 (500 )', - '2012-05-03 12:07:50 (500 s)11', - ) + test_entries = ( + '', + '2012-05-03', + '2012-05-03 12:07:60 (500 s)', + '2012-05-03 12:07:50 (500s)', + '2012-05-03 12:07:50 (500 s', + '2012-05-03 12:07:50 (500 s)11', + ) - for entry in test_entries: - desc_text = get_relay_extrainfo_descriptor({keyword: entry}, content = True) - desc = self._expect_invalid_attr(desc_text) - self.assertEqual(None, getattr(desc, end_attr)) - self.assertEqual(None, getattr(desc, interval_attr)) - self.assertEqual(None, getattr(desc, values_attr)) + for entry in test_entries: + desc_text = get_relay_extrainfo_descriptor({'write-history': entry}, content = True) + desc = self._expect_invalid_attr(desc_text) + self.assertEqual(None, desc.write_history_end) + self.assertEqual(None, desc.write_history_interval) + self.assertEqual(None, desc.write_history_values) def test_port_mapping_lines(self): """

1 0

[tor-browser-build/master] macosx-toolchain-gcc: add option to use 10.7 SDK
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit a226f20743c19cf7930264d76e0b914bd425cec5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:35:44 2017 +0100 macosx-toolchain-gcc: add option to use 10.7 SDK We need the 10.7 SDK to build GO. --- projects/macosx-toolchain-gcc/build | 1 + projects/macosx-toolchain-gcc/config | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build index 1b21d76..778194d 100644 --- a/projects/macosx-toolchain-gcc/build +++ b/projects/macosx-toolchain-gcc/build @@ -4,4 +4,5 @@ rootdir=$(pwd) destdir='[% dest_dir _ '/' _ c('filename') %]' mkdir -p "$destdir" mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb +mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config index 1a56401..31ac46f 100644 --- a/projects/macosx-toolchain-gcc/config +++ b/projects/macosx-toolchain-gcc/config @@ -6,7 +6,6 @@ var: setup: | macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc mkdir -p $macosx_toolchain_gcc_dir - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" # For OpenSSL @@ -14,15 +13,28 @@ var: #For gmp, need to trick it so it knows we're doing a 64 bit build for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + + [% IF pc(c('origin_project'), "var/10_7_SDK") %] + export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar + export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc + export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ + tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz + export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" + [% ELSE %] + dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir + # XXX Clean up these flags? + export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" + export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + [% END %] input_files: - name: SDK URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + - name: SDK_10_7 + URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… + sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - name: toolchain URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9

1 0

[tor-browser-build/master] Add meek and obfs4
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit 9cbe67960c0d80f393a72715dab4fb32afed7094 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:50:33 2017 +0100 Add meek and obfs4 --- keyring/goptlib.gpg | Bin 0 -> 5876 bytes keyring/meek.gpg | Bin 0 -> 5876 bytes keyring/obfs4.gpg | Bin 0 -> 41312 bytes projects/ed25519/config | 18 ++++++++++ projects/go/build | 74 ++++++++++++++++++++++++++++++++++++++++ projects/go/config | 80 ++++++++++++++++++++++++++++++++++++++++++++ projects/goptlib/config | 18 ++++++++++ projects/goxcrypto/config | 24 +++++++++++++ projects/goxnet/config | 22 ++++++++++++ projects/meek/build | 49 +++++++++++++++++++++++++++ projects/meek/config | 15 +++++++++ projects/obfs4/build | 34 +++++++++++++++++++ projects/obfs4/config | 30 +++++++++++++++++ projects/siphash/config | 16 +++++++++ projects/tor-browser/build | 17 ++++++++-- projects/tor-browser/config | 4 +++ projects/uniuri/config | 20 +++++++++++ 17 files changed, 419 insertions(+), 2 deletions(-) diff --git a/keyring/goptlib.gpg b/keyring/goptlib.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/goptlib.gpg differ diff --git a/keyring/meek.gpg b/keyring/meek.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/meek.gpg differ diff --git a/keyring/obfs4.gpg b/keyring/obfs4.gpg new file mode 100644 index 0000000..f26a4cd Binary files /dev/null and b/keyring/obfs4.gpg differ diff --git a/projects/ed25519/config b/projects/ed25519/config new file mode 100644 index 0000000..5bab68b --- /dev/null +++ b/projects/ed25519/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/agl/ed25519.git +git_hash: c4161f4c7483313562781c61b9a20aba73daf9de +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/agl/ed25519 + go_lib_install: + - github.com/agl/ed25519/extra25519 + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/go/build b/projects/go/build new file mode 100644 index 0000000..2efd928 --- /dev/null +++ b/projects/go/build @@ -0,0 +1,74 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist + +[% IF c("var/linux") %] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 +[% END %] + +mkdir -p /var/tmp/build + +# Building go 1.4.x +# This is needed to bootstrap the go that we actually use +# https://golang.org/doc/install/source#go14 +tar -C /var/tmp/build --transform='s,^go\>,go1.4,' -xf $rootdir/[% c('input_files_by_name/go14') %] +cd /var/tmp/build/go1.4/src +# Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. +# https://github.com/golang/go/issues/13114#issuecomment-186922245 +# Disable CC etc. that are set up for cross builds. +CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash +export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" + +cd $rootdir +[% IF ! c("var/linux") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END %] + +# Building go +# http://golang.org/doc/install/source#environment +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/go') %] +export GOROOT="$distdir" +cd /var/tmp/dist/go/src +[% IF c("var/linux") -%] + ./make.bash +[% ELSIF c("var/osx") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=darwin + export GOARCH=386 + # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. + # https://github.com/golang/go/issues/17732 + sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% ELSIF c("var/windows") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec i686-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=windows + export GOARCH=386 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% END -%] + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/go/config b/projects/go/config new file mode 100644 index 0000000..a5920f5 --- /dev/null +++ b/projects/go/config @@ -0,0 +1,80 @@ +# vim: filetype=yaml sw=2 +version: 1.7.4 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +var: + go14_version: 1.4.3 + + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] + export GOOS=[% c("var/GOOS") %] + export GOARCH=[% c("var/GOARCH") %] + export GOPATH=/var/tmp/dist/gopath + export PATH=/var/tmp/dist/go/bin:"$PATH" + + # Template build script for building a go library. + # This can be called as projects/go/var/build_go_lib. + # You need to define /var/go_lib, and optionaly var/go_lib_install as + # a list of install targets. + build_go_lib: | + #!/bin/bash + set -e + rootdir=$(pwd) + [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] + distdir=/var/tmp/dist/[% project %] + mkdir -p /var/tmp/build + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") + mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" + cd "$GOPATH/src/[% c("var/go_lib") %]" + [% IF c("var/go_lib_install") -%] + [% FOREACH inst IN c("var/go_lib_install") %] + go install [% inst %] + [% END %] + [% ELSE %] + go install [% c("var/go_lib") %] + [% END %] + cd /var/tmp/dist + [% c('tar', { + tar_src => [ 'gopath' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + +targets: + windows-i686: + var: + GOOS: windows + GOARCH: 386 + osx-x86_64: + var: + arch_deps: + - libc6-i386 + - libstdc++6:i386 + pre_pkginst: dpkg --add-architecture i386 + compiler: macosx-toolchain-gcc + 10_7_SDK: 1 + GOOS: darwin + GOARCH: 386 + linux: + var: + GOOS: linux + linux-x86_64: + var: + GOARCH: amd64 + linux-i686: + var: + GOARCH: 386 + +input_files: + - project: docker-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") || c("var/osx") %]' + - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' + name: go + sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' + name: go14 + sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/goptlib/config b/projects/goptlib/config new file mode 100644 index 0000000..dd520ec --- /dev/null +++ b/projects/goptlib/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: 0.5 +git_url: https://git.torproject.org/pluggable-transports/goptlib.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: goptlib.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: git.torproject.org/pluggable-transports/goptlib.git + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config new file mode 100644 index 0000000..8362f28 --- /dev/null +++ b/projects/goxcrypto/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/crypto +git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/crypto + go_lib_install: + - golang.org/x/crypto/curve25519 + - golang.org/x/crypto/hkdf + - golang.org/x/crypto/nacl/secretbox + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config new file mode 100644 index 0000000..507f997 --- /dev/null +++ b/projects/goxnet/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/net +git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/net + go_lib_install: + - golang.org/x/net/proxy + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/meek/build b/projects/meek/build new file mode 100644 index 0000000..d195e90 --- /dev/null +++ b/projects/meek/build @@ -0,0 +1,49 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/osx") %] + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" + DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/meek" +[% ELSE %] + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" + DOCSDIR="$distdir/TorBrowser/Docs/meek" +[% END %] +mkdir -p $PTDIR $DOCSDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +cd meek-client +go build -ldflags '-s' +cp -a meek-client[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd ../meek-client-torbrowser +go build -ldflags '-s' +cp -a meek-client-torbrowser[% IF c("var/windows") %].exe[% END %] $PTDIR + + +[% IF c("var/windows") %] + cd ../terminateprocess-buffer + go build -ldflags '-s' + cp -a terminateprocess-buffer.exe $PTDIR +[% END %] + +cd .. +cp -a README doc/* $DOCSDIR + +cd firefox +[% c('zip', { + zip_src => [ '.' ], + zip_args => '$distdir/meek-http-helper(a)bamsoftware.com.xpi', + }) %] + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/meek/config b/projects/meek/config new file mode 100644 index 0000000..84ed2bd --- /dev/null +++ b/projects/meek/config @@ -0,0 +1,15 @@ +# vim: filetype=yaml sw=2 +version: 0.25 +git_url: https://git.torproject.org/pluggable-transports/meek.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: meek.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib diff --git a/projects/obfs4/build b/projects/obfs4/build new file mode 100644 index 0000000..ff313e9 --- /dev/null +++ b/projects/obfs4/build @@ -0,0 +1,34 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/osx") %] + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" +[% ELSE %] + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" +[% END %] +mkdir -p $PTDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" +ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" +cd obfs4proxy +go build -ldflags '-s' +cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/obfs4/config b/projects/obfs4/config new file mode 100644 index 0000000..952b054 --- /dev/null +++ b/projects/obfs4/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: 0.0.5 +git_url: https://git.torproject.org/pluggable-transports/obfs4.git +git_hash: 'obfs4proxy-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib + - name: ed25519 + project: ed25519 + - name: siphash + project: siphash + - name: uniuri + project: uniuri + - name: goxcrypto + project: goxcrypto + - name: goxnet + project: goxnet diff --git a/projects/siphash/config b/projects/siphash/config new file mode 100644 index 0000000..0f3f4b5 --- /dev/null +++ b/projects/siphash/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/siphash.git +git_hash: 42ba037e748c9062a75e0924705c43b893edefcd +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/siphash + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/tor-browser/build b/projects/tor-browser/build index a5f9e1d..e25a1d8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -52,7 +52,9 @@ mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton@torprojec mv [% c('input_files_by_name/https-everywhere') %] $TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi mv [% c('input_files_by_name/noscript') %] $TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi -# TODO: add meek xpi +tar -C $TBDIR -xf [% c('input_files_by_name/obfs4') %] +tar -C $TBDIR -xf [% c('input_files_by_name/meek') %] +mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extensions/ tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] @@ -105,7 +107,18 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b cp -a Bundle-Data/Docs $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x -# TODO: install pluggable transports here +cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults +cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js + +[% IF c("var/osx") %] + pushd $TBDIR + # Create the meek-template-sha256sum.txt file by generating a list + # of hashes (one for each file within the meek-http-helper profile) and + # and then generating one final hash from the contents of the list. + sha256sum `find $MEEKPROFILEPATH -type f | sort` | sha256sum | sed -e 's/ *-$//' > $MEEKPROFILEPATH/meek-template-sha256sum.txt + popd +[% END %] [% IF c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 9ec262b..01463d9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -42,6 +42,10 @@ input_files: name: https-everywhere - project: fonts name: fonts + - project: meek + name: meek + - project: obfs4 + name: obfs4 - filename: Bundle-Data - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript diff --git a/projects/uniuri/config b/projects/uniuri/config new file mode 100644 index 0000000..62fa8ef --- /dev/null +++ b/projects/uniuri/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/uniuri +git_hash: 8902c56451e9b58ff940bbe5fec35d5f9c04584a +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/uniuri + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 01 Feb '17

01 Feb '17

commit a9c085c9c0b5b08365420305a4f57ca5fca5beba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 1 21:48:13 2017 +0000 Update translations for tails-greeter-2_completed --- nl/nl.po | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 321 insertions(+) diff --git a/nl/nl.po b/nl/nl.po new file mode 100644 index 0000000..3913cc2 --- /dev/null +++ b/nl/nl.po @@ -0,0 +1,321 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-31 10:47+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>, 2017\n" +"Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/greeter.ui.h:1 +msgid "Administration Password" +msgstr "Beheerderswachtwoord" + +#: ../data/greeter.ui.h:2 +msgid "" +"Set up an administration password if you need to perform administrative " +"tasks. Otherwise, the administration password is disabled for better " +"security." +msgstr "" +"Voer een beheerderswachtwoord in wanneer je beheerstaken moet uitvoeren. " +"Indien dit niet ingevuld wordt, zal het uitgeschakeld worden voor een betere" +" beveiliging." + +#: ../data/greeter.ui.h:3 +msgid "Enter an administration password" +msgstr "Voer een beheerderswachtwoord in." + +#: ../data/greeter.ui.h:4 +msgid "Confirm" +msgstr "Bevestig" + +#: ../data/greeter.ui.h:5 +msgid "Confirm your administration password" +msgstr "Bevestig je beheerderswachtwoord" + +#: ../data/greeter.ui.h:6 +msgid "Disable" +msgstr "Schakel uit" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:8 +msgid "Windows Camouflage" +msgstr "Windowscamouflage" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:10 +msgid "" +"This option makes Tails look like Microsoft Windows 10. This can be useful " +"to avoid attracting suspicion in public places." +msgstr "" +"Deze optie laat Tails meer op Microsoft Windows 10 lijken. Zo valt het " +"minder op en zal men minder argwaan krijgen wanneer je op een openbare " +"plaats bent." + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:12 +msgid "Microsoft Windows 10 camouflage" +msgstr "Microsoft Windows 10 camouflage" + +#: ../data/greeter.ui.h:13 +msgid "MAC Address Spoofing" +msgstr "MAC adres spoofing" + +#: ../data/greeter.ui.h:14 +msgid "" +"MAC address spoofing hides the serial number of your network interface (Wi-" +"Fi or wired) to the local network. Spoofing MAC addresses is generally safer" +" as it helps you hide your geographical location. But it might also create " +"connectivity problems or look suspicious." +msgstr "" +"MAC adres spoofing verbergt het serienummer van je netwerkkaart (wifi of " +"kabel) op lokale netwerken. Spoofing MAC adressen is meestal veiliger want " +"het helpt in het verbergen van je geografische locatie. Maar het kan ook " +"verbindingsproblemen met zich meebrengen of er verdacht uitzien." + +#: ../data/greeter.ui.h:15 +msgid "Spoof all MAC addresses (default)" +msgstr "Alle MAC adressen spoofen (standaard)" + +#: ../data/greeter.ui.h:16 +msgid "Don't spoof MAC addresses" +msgstr "MAC adressen niet spoofen" + +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtzin." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Je zal de Tor Bridge en lokale proxy later instellen nadat je met een " +"netwerk verbinding hebt gemaakt." + +#: ../data/greeter.ui.h:19 +msgid "Welcome to Tails!" +msgstr "Welkom bij Tails!" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:21 +msgctxt "" +msgid "" +"To get guided through Tails' settings, click on Take a Tour above" +msgstr "" +"Om de rondleiding door de Tails' settings te volgen, klik op Start de " +"Rondleiding hierboven" + +#: ../data/greeter.ui.h:22 +msgid "Language & Region" +msgstr "Taal & Regio" + +#: ../data/greeter.ui.h:23 +msgid "Default Settings" +msgstr "Standaard instellingen" + +#: ../data/greeter.ui.h:24 +msgid "Save Language & Region Settings" +msgstr "Bewaar Taal & Regio instellingen" + +#: ../data/greeter.ui.h:25 +msgid "Language" +msgstr "Taal" + +#: ../data/greeter.ui.h:26 +msgid "Keyboard Layout" +msgstr "Toetsenbordindeling" + +#: ../data/greeter.ui.h:27 +msgid "Formats" +msgstr "Formaten" + +#: ../data/greeter.ui.h:28 +msgid "Time Zone" +msgstr "Tijdzone" + +#: ../data/greeter.ui.h:29 +msgid "Encrypted Persistent Storage" +msgstr "Versleutelde persistente opslag" + +#: ../data/greeter.ui.h:30 +msgid "Show Passphrase" +msgstr "Toon wachtzin" + +#: ../data/greeter.ui.h:31 +msgid "Configure Persistent Storage" +msgstr "Versleutelde persistente opslag configureren" + +#: ../data/greeter.ui.h:32 +msgid "Enter your passphrase to unlock the persistent storage" +msgstr "Voer je wachtzin in om de persistente opslag te ontgrendelen." + +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 +#: ../tailsgreeter/gui.py:510 +msgid "Unlock" +msgstr "Ontgrendel" + +#: ../data/greeter.ui.h:34 +msgid "Relock Persistent Storage" +msgstr "Persistente opslag weer vergrendelen" + +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"Je persistente opslag is ontgrendeld. Herstart Tails om het opnieuw te " +"vergrendelen." + +#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 +msgid "Additional Settings" +msgstr "bijkomende instellingen" + +#: ../data/greeter.ui.h:37 +msgid "Save Additional Settings" +msgstr "bewaar bijkomende instellingen" + +#: ../data/greeter.ui.h:38 +msgid "Add an additional setting" +msgstr "voeg een bijkomende instelling toe" + +#: ../data/greeter.ui.h:39 +msgid "Network Configuration" +msgstr "Netwerkconfiguratie" + +#: ../data/greeter.ui.h:40 +msgid "" +"If your Internet connection is censored, filtered, or proxied you can " +"configure a Tor bridge or a local proxy. To work completely offline, you can" +" disable all networking." +msgstr "" +"Als je internetverbinding is gecensureerd, gefilterd of via een proxy loopt," +" kan je een Tor bridge of lokale proxy configureren. Om helemaal offline te " +"werken, kan je alle netwerken uitschakelen." + +#: ../data/greeter.ui.h:41 +msgid "Connect directly to the Tor network (default)" +msgstr "Verbind rechtstreeks met het Tor netwerk (standaard)" + +#: ../data/greeter.ui.h:42 +msgid "Configure a Tor bridge, firewall, or proxy settings" +msgstr "Configureer en Tor bridge, firewall of proxy instelling" + +#: ../data/greeter.ui.h:43 +msgid "Disable all networking" +msgstr "Alle netwerken uitschakelen" + +#: ../data/greeter.ui.h:44 +msgid "" +"The default settings are safe in most situations. To add a custom setting, " +"press the \"+\" button below." +msgstr "" +"De standaard instellingen zijn veilig in de meeste situaties. Om een " +"aangepaste instelling toe te voegen, klik op de \"+\"knop hieronder." + +#: ../data/greeter.ui.h:45 +msgid "Off (default)" +msgstr "Uit (standaard)" + +#: ../data/greeter.ui.h:46 +msgid "On (default)" +msgstr "Aan (standaard)" + +#: ../data/greeter.ui.h:47 +msgid "Network Connection" +msgstr "Netwerkverbinding" + +#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 +msgid "Direct (default)" +msgstr "Rechtstreeks (standaard)" + +#: ../tailsgreeter/gui.py:373 +msgid "Bridge & Proxy" +msgstr "Bridge & Proxy" + +#: ../tailsgreeter/gui.py:379 +msgid "Offline" +msgstr "Offline" + +#: ../tailsgreeter/gui.py:463 +msgid "Failed to relock persistent storage." +msgstr "Mislukt om de persistente opslag weer te vergrendelen." + +#: ../tailsgreeter/gui.py:481 +msgid "Unlocking…" +msgstr "Ontgrendelen…" + +#: ../tailsgreeter/gui.py:562 +msgid "Cancel" +msgstr "Annuleren" + +#: ../tailsgreeter/gui.py:566 +msgid "Add" +msgstr "Voeg toe" + +#: ../tailsgreeter/gui.py:572 +msgid "Back" +msgstr "Vorige" + +#: ../tailsgreeter/gui.py:658 +msgid "Shutdown" +msgstr "Uitschakelen" + +#: ../tailsgreeter/gui.py:664 +msgid "Start Tails" +msgstr "Start Tails" + +#: ../tailsgreeter/language.py:119 +msgid "default:LTR" +msgstr "Standaard: links naar rechts" + +#: ../tailsgreeter/persistence.py:89 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stderr}" +msgstr "" +"live-persist mislukte met retourcode {returncode}:\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 +#, python-brace-format +msgid "" +"cryptsetup failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"cryptsetup mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:154 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:168 +#, python-brace-format +msgid "" +"umount failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"unmount mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}"

1 0