- tor-commits - lists.torproject.org

[ooni-probe/master] Implement GeoIP lookup support
by art＠torproject.org 07 Nov '12

07 Nov '12

commit e056fe9b886c3dfaf9546cd94656eec8117f70f8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 17:14:59 2012 +0100 Implement GeoIP lookup support * From configuration options it is possible to choice what level of privacy the prober is willing to accept. --- ooni/config.py | 5 +++++ ooni/reporter.py | 34 ++++++++++++++++++---------------- ooni/utils/geodata.py | 27 +++++++++++++++++++++++++++ ooni/utils/log.py | 6 +++--- ooniprobe.conf | 16 +++++++++++----- 5 files changed, 64 insertions(+), 24 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index 97f396c..5880d69 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -29,6 +29,11 @@ basic = Storage() for k, v in configuration['basic'].items(): basic[k] = v +# Process the privacy configuration options +privacy = Storage() +for k, v in configuration['privacy'].items(): + privacy[k] = v + # Process the advanced configuration options advanced = Storage() for k, v in configuration['advanced'].items(): diff --git a/ooni/reporter.py b/ooni/reporter.py index f3fbca6..6fab5f9 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -186,33 +186,35 @@ class ReporterFactory(OReporter): self._writeln("###########################################") client_geodata = {} - log.msg("Running geo IP lookup via check.torproject.org") - client_ip = yield geodata.myIP() - if config.includeip: + if config.privacy.includeip or \ + config.privacy.includeasn or \ + config.privacy.includecountry or \ + config.privacy.includecity: + log.msg("Running geo IP lookup via check.torproject.org") + client_ip = yield geodata.myIP() + client_location = geodata.IPToLocation(client_ip) + else: + client_ip = "127.0.0.1" + + if config.privacy.includeip: client_geodata['ip'] = client_ip else: - client_geodata['ip'] = None + client_geodata['ip'] = "127.0.0.1" client_geodata['asn'] = None client_geodata['city'] = None client_geodata['countrycode'] = None - try: - import txtorcon - client_location = txtorcon.util.NetLocation(client_geodata['ip']) - if config.includeasn: - client_geodata['asn'] = client_location.asn + if config.privacy.includeasn: + client_geodata['asn'] = client_location['asn'] - if config.includecity: - client_geodata['city'] = client_location.city + if config.privacy.includecity: + client_geodata['city'] = client_location['city'] - if config.includecountry: - client_geodata['countrycode'] = client_location.countrycode + if config.privacy.includecountry: + client_geodata['countrycode'] = client_location['countrycode'] - except ImportError: - log.err("txtorcon is not installed. Geolocation lookup is not"\ - "supported") test_details = {'start_time': repr(date.now()), 'probe_asn': client_geodata['asn'], diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index 5254044..bd61dfd 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -1,7 +1,9 @@ import re import pygeoip +import os from ooni import config +from ooni.utils import log from twisted.web.client import Agent from twisted.internet import reactor, defer, protocol @@ -38,3 +40,28 @@ def myIP(): defer.returnValue(myip) +class GeoIPDataFilesNotFound(Exception): + pass + +def IPToLocation(ipaddr): + city_file = os.path.join(config.advanced.geoip_data_dir, 'GeoLiteCity.dat') + country_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIP.dat') + asn_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIPASNum.dat') + + location = {'city': None, 'countrycode': None, 'asn': None} + try: + city_dat = pygeoip.GeoIP(city_file) + location['city'] = city_dat.record_by_addr(ipaddr)['city'] + + country_dat = pygeoip.GeoIP(country_file) + location['countrycode'] = country_dat.country_code_by_addr(ipaddr) + + asn_dat = pygeoip.GeoIP(asn_file) + location['asn'] = asn_dat.org_by_addr(ipaddr) + except IOError: + log.err("Could not find GeoIP data files. Go into data/ " + "and run make geoip") + raise GeoIPDataFilesNotFound + + return location + diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 57e5d61..0cb62ac 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -11,13 +11,13 @@ from twisted.python import log as txlog from twisted.python.logfile import DailyLogFile from ooni.utils import otime -from ooni import oconfig +from ooni import config def start(logfile=None): daily_logfile = None if not logfile: - logfile = oconfig.basic.logfile + logfile = config.basic.logfile log_folder = os.path.dirname(logfile) log_filename = os.path.basename(logfile) @@ -29,7 +29,7 @@ def start(logfile=None): logging.basicConfig() python_logging = txlog.PythonLoggingObserver() - if oconfig.advanced.debug: + if config.advanced.debug: python_logging.logger.setLevel(logging.DEBUG) else: python_logging.logger.setLevel(logging.INFO) diff --git a/ooniprobe.conf b/ooniprobe.conf index 278dc4c..2039951 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -5,15 +5,21 @@ basic: # Where OONIProbe should be writing it's log file logfile: /tmp/ooniprobe.log + +privacy: # Should we include the IP address of the probe in the report? - includeip: true + includeip: false # Should we include the ASN of the probe in the report? - includeasn: true + includeasn: false # Should we include the ASN of the probe in the report? - includecountry: true + includecountry: false # Should we include the ASN of the probe in the report? - includecity: true + includecity: false + advanced: - geoip_data_dir: /home/x/code/networking/ooni-probe/data + # XXX change this to point to the directory where you have stored the GeoIP + # database file. This should be the directory in which OONI is installed + # /path/to/ooni-probe/data/ + geoip_data_dir: /home/x/code/networking/ooni-probe/data/ debug: true

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 04dd3fc58eec0f5b2b674f5ae697c8ab842bbe0d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:27 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 12 +- fr/vidalia_fr.po | 653 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 400 insertions(+), 265 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9b89134..6ed7c6b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-07 12:23+0000\n" +"PO-Revision-Date: 2012-11-07 16:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -130,23 +130,23 @@ msgstr "Examinar " msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "Carpeta de Datos " +msgstr "Carpeta de Datos" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "Almacenar datos de Tor en la siguiente carpeta " +msgstr "Almacenar datos de Tor en la siguiente carpeta" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " +msgstr "Seleccione la carpeta que se usará para almacenar los datos de Tor" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor (Protocolo de)" +msgstr "Control de Tor" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "Usar conexión TCP (ControlPort) " +msgstr "Usar conexión TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index bfef8de..6a6ef05 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -1,6 +1,8 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012. +# Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. +# <paul(a)dabuttonfactory.com>, 2012. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. # <pouicpouicpouic(a)gmail.com>, 2011. # Sylvie SEGUI <seguisylvie(a)yahoo.fr>, 2012. @@ -8,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-15 07:48+0000\n" +"POT-Creation-Date: 2012-03-21 17:46+0000\n" +"PO-Revision-Date: 2012-11-07 16:42+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -86,11 +88,11 @@ msgstr "Vidalia n'a pas pu installer le service Tor." msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "Authentification:" +msgstr "Authentification :" msgctxt "AdvancedPage" msgid "Address:" -msgstr "Adresse:" +msgstr "Adresse :" msgctxt "AdvancedPage" msgid "None" @@ -162,7 +164,7 @@ msgstr "Modifier le fichier torrc actuel" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "REMARQUE: ceci va éditer le fichier torrc actuellement actif" +msgstr "REMARQUE : ceci va éditer le fichier torrc actuellement actif" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -197,12 +199,50 @@ msgid "Select a file to use for Tor socket path" msgstr "Sélectionnez un fichier à utiliser pour le chemin de la socket de Tor" msgctxt "AdvancedPage" +msgid "Configure ControlPort automatically" +msgstr "Configurer automatiquement le ControlPort" + +msgctxt "AdvancedPage" +msgid "" +"WARNING: If you hand pick the password it will be saved as plain text" +" in Vidalia's configuration file. Using a random password is safer." +msgstr " ATTENTION : Si vous choisissez vous-même le mot de passe, il sera enregistré en tant que texte brut dans le fichier de configuration de Vidalia. L'utilisation d'un mot de passe aléatoire est plus sûr." + +msgctxt "AdvancedPage" +msgid "Panic" +msgstr "Panique" + +msgctxt "AdvancedPage" +msgid "" +"WARNING: The panic button will erease the application if pressed" +msgstr " ATTENTION : Le bouton de panique va effacer l'application si elle est pressée" + +msgctxt "AdvancedPage" +msgid "Enable panic button" +msgstr "Activer le bouton de panique" + +msgctxt "AdvancedPage" +msgid "Panic path:" +msgstr "Chemin de panique :" + +msgctxt "AdvancedPage" +msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "Vous avez coché l'option de configuration automatique (autoconfiguration) pour le ControlPort, mais vous n'avez pas fourni de données Directory. S'il vous plaît, ajouter une, ou décochez la case \"Configure ControlPort automatically\"." + +msgctxt "AdvancedPage" msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." msgstr "Vidalia a été incapable de supprimer le service Tor.\n\nVous pourriez avoir besoin de le supprimer manuellement." +msgctxt "AdvancedPage" +msgid "Select a Directory to Use for Panic" +msgstr "Sélectionnez un répertoire à utiliser pour Panic" + msgctxt "AppearancePage" msgid "Language" msgstr "Langue" @@ -223,9 +263,26 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "Vidalia n'a pas pu charger la traduction pour la langue sélectionnée." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "Préférences Système Icône (modifications prendront effet lorsque vous redémarrez Vidalia)" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "Afficher l'icône de plateau et l'icône du Dock (par défaut)" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "Cacher l’icône de la barre des tâches" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "Masquer l'icône du Dock" + msgctxt "BandwidthGraph" msgid "Since:" -msgstr "Depuis:" +msgstr "Depuis :" msgctxt "BandwidthGraph" msgid "Hide Settings" @@ -281,19 +338,19 @@ msgstr "Graphique de la bande passante" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Démarrage de la demande de passerelle HTTPS ..." +msgstr "Démarrage de la demande de passerelle HTTPS…" msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "Connexion à %1:%2 ..." +msgstr "Connexion à %1:%2…" msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Envoi une demande de liste de passerelles HTTPS..." +msgstr "Envoi une demande de liste de passerelles HTTPS…" msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Téléchargement d'une liste de passerelles..." +msgstr "Téléchargement d'une liste de passerelles…" msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" @@ -305,7 +362,7 @@ msgstr "Impossible de télécharger les passerelles : %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Nouvelle tentative de demande de passerelle ..." +msgstr "Nouvelle tentative de demande de passerelle…" msgctxt "BridgeUsageDialog" msgid "Country" @@ -388,10 +445,6 @@ msgid "Sharing" msgstr "Partage" msgctxt "ConfigDialog" -msgid "Services" -msgstr "Services" - -msgctxt "ConfigDialog" msgid "Appearance" msgstr "Apparence" @@ -437,6 +490,12 @@ msgstr "Problème de connexion à Tor" msgctxt "ControlPasswordInputDialog" msgid "" +"Vidalia can try to restart Tor for you. Doing so will close all currently " +"active connections through your Tor process." +msgstr "Vidalia peut tenter de relancer Tor pour vous. Cela permettra de fermer toutes les connexions actuellement actives sur le processus Tor." + +msgctxt "ControlPasswordInputDialog" +msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." @@ -448,12 +507,6 @@ msgid "" "one." msgstr "Il sera nécessaire d'arrêter le processus Tor avant que Vidalia puisse en lancer un nouveau." -msgctxt "ControlPasswordInputDialog" -msgid "" -"Vidalia can try to restart Tor for you. Doing so will close all currently " -"active connections through your Tor process." -msgstr "Vidalia peut tenter de relancer Tor pour vous. Cela permettra de fermer toutes les connexions actuellement actives sur le processus Tor." - msgctxt "ControlSocket" msgid "Control socket is not connected." msgstr "Le socket de contrôle n'est pas connecté." @@ -1275,24 +1328,6 @@ msgid "Vidalia encountered an error and needed to close" msgstr "Vidalia a rencontré une erreur et doit fermer" msgctxt "CrashReportDialog" -msgid "" -"A crash report has been created that you can automatically send to the " -"Vidalia developers to help identify and fix the problem. The submitted " -"report does not contain any personally identifying information, but your " -"connection to the crash reporting server may not be anonymous." -msgstr "Un rapport d'erreur a été créé, vous pouvez l'envoyer automatiquement aux développeurs Vidalia pour aider à l'identification et à la résolution du problème. Le rapport soumis ne contient aucune information d'identification personnelle mais votre connexion au serveur de rapport d'erreur peut ne pas être anonyme." - -msgctxt "CrashReportDialog" -msgid "" -"Please also describe what you were doing before the application crashed " -"(optional):" -msgstr "Merci de bien vouloir décrire ce que vous faisiez avant le plantage de l'applicaiton (optionnel):" - -msgctxt "CrashReportDialog" -msgid "Send my crash report to the Vidalia developers" -msgstr "Envoyer mon rapport d'erreur aux développeurs de Vidalia" - -msgctxt "CrashReportDialog" msgid "Restart Vidalia" msgstr "Redémarrer Vidalia" @@ -1310,17 +1345,44 @@ msgid "" "manually." msgstr "Redémarrage automatique de Vidalia impossible. Merci de redémarrer manuellement." -msgctxt "CrashReportUploader" -msgid "Connecting..." -msgstr "Connexion..." +msgctxt "CrashReportDialog" +msgid "Please fill a ticket in:" +msgstr "Merci de remplir un ticket dans:" + +msgctxt "CrashReportDialog" +msgid "" +"<a " +"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" + +msgctxt "CrashReportDialog" +msgid "" +"A crash report has been created that you can send to the Vidalia developers " +"to help identify and fix the problem. The submitted report does not contain " +"any personally identifying information." +msgstr "Un rapport de crash a été crée que vous pouvez envoyer aux développeurs de Vidalia pour aider à identifier et corriger le problème. Le rapport ne contient pas d’informations vous identifiant." + +msgctxt "CrashReportDialog" +msgid "" +"with a description of what you were doing before the application crashed, " +"along with the following files corresponding to the crash report:" +msgstr "avec une description de ce que vous faisiez avant que le programme s'est crashé, ainsi que les fichiers suivants correspondant à la rapport de crash :" + +msgctxt "DebugDialog" +msgid "Plugin debug output" +msgstr "Données de sortie du débogage du greffon" + +msgctxt "DebugDialog" +msgid "Plugin Output" +msgstr "Données de sortie du greffon" -msgctxt "CrashReportUploader" -msgid "Sending crash report..." -msgstr "Envoi du rapport d'erreur..." +msgctxt "DebugDialog" +msgid "Syntax Errors" +msgstr "Erreurs de syntaxe" -msgctxt "CrashReportUploader" -msgid "Receiving response..." -msgstr "Réception de la réponse..." +msgctxt "DebugDialog" +msgid "Exceptions" +msgstr "Exceptions" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -1331,10 +1393,6 @@ msgid "Select Path to Tor" msgstr "Sélectionner le chemin de Tor" msgctxt "GeneralPage" -msgid "Select Proxy Executable" -msgstr "Sélectionner le fichier exécutable du proxy" - -msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." msgstr "Vous devez définir le nom de votre exécutable Tor" @@ -1351,18 +1409,6 @@ msgid "Tor" msgstr "Tor" msgctxt "GeneralPage" -msgid "Proxy Application (optional)" -msgstr "Application Proxy (optionnel)" - -msgctxt "GeneralPage" -msgid "Start a proxy application when Tor starts" -msgstr "Lancer une application proxy lorsque Tor démarre" - -msgctxt "GeneralPage" -msgid "Proxy Application Arguments:" -msgstr "Arguments de l'application Proxy" - -msgctxt "GeneralPage" msgid "Software Updates" msgstr "Mises à jour logicielles" @@ -1380,11 +1426,11 @@ msgstr "Se connecter à Tor automatiquement" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "%1 Ko/s" +msgstr "%1 ko/s" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "%1 Ko" +msgstr "%1 ko" msgctxt "GraphFrame" msgid "%1 MB" @@ -1392,15 +1438,15 @@ msgstr "%1 Mo" msgctxt "GraphFrame" msgid "%1 GB" -msgstr "%1 GB" +msgstr "%1 Go" msgctxt "GraphFrame" msgid "Recv:" -msgstr "Reçu:" +msgstr "Reçu :" msgctxt "GraphFrame" msgid "Sent:" -msgstr "Env:" +msgstr "Env :" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." @@ -1488,7 +1534,7 @@ msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" -msgstr "Rechercher:" +msgstr "Rechercher :" msgctxt "HelpBrowser" msgid "Find Previous" @@ -1528,7 +1574,7 @@ msgstr "Documents trouvés" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "Erreur lors du chargement de l'aide:" +msgstr "Erreur lors du chargement de l'aide :" msgctxt "HelpTextBrowser" msgid "Opening External Link" @@ -1557,7 +1603,7 @@ msgstr "Vidalia a été incapable d'ouvrir le lien sélectionné dans votre navi msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "Erreur d'ouverture du fichier d'aide:" +msgstr "Erreur d'ouverture du fichier d'aide :" msgctxt "LicenseDialog" msgid "License Information" @@ -1656,10 +1702,6 @@ msgid "Help" msgstr "Aide" msgctxt "MainWindow" -msgid "New Identity" -msgstr "Nouvelle Identité" - -msgctxt "MainWindow" msgid "Tor" msgstr "Tor" @@ -1668,36 +1710,12 @@ msgid "View" msgstr "Voir" msgctxt "MainWindow" -msgid "Error starting web browser" -msgstr "Erreur au lancement du navigateur" - -msgctxt "MainWindow" -msgid "Vidalia was unable to start the configured web browser" -msgstr "Vidalia n'est pas parvenu à démarrer le navigateur Web configuré" - -msgctxt "MainWindow" -msgid "Error starting IM client" -msgstr "Erreur au lancement du client IM" - -msgctxt "MainWindow" -msgid "Vidalia was unable to start the configured IM client" -msgstr "Vidalia n'a pas pu lancer le client IM configuré" - -msgctxt "MainWindow" -msgid "Error starting proxy server" -msgstr "Erreur au lancement du serveur proxy" - -msgctxt "MainWindow" -msgid "Vidalia was unable to start the configured proxy server" -msgstr "Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré" - -msgctxt "MainWindow" msgid "Connecting to a relay directory" msgstr "Connexion à un annuaire de relais" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "Etablissement d'une connexion annuaire chiffrée" +msgstr "Établissement d'une connexion annuaire chiffrée" msgctxt "MainWindow" msgid "Retrieving network status" @@ -1729,11 +1747,7 @@ msgstr "Réalisation d'un circuit Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" -msgstr "Connecté au réseau Tor!" - -msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "Etat du démarrage inconnu" +msgstr "Connecté au réseau Tor !" msgctxt "MainWindow" msgid "miscellaneous" @@ -1745,7 +1759,7 @@ msgstr "identité incorrecte" msgctxt "MainWindow" msgid "done" -msgstr "fait" +msgstr "effectué" msgctxt "MainWindow" msgid "connection refused" @@ -1811,7 +1825,7 @@ msgstr "Erreur de connexion" msgctxt "MainWindow" msgid "Relaying is Enabled" -msgstr "Le relais est activé" +msgstr "Le relai est activé" msgctxt "MainWindow" msgid "Error Shutting Down" @@ -1873,7 +1887,7 @@ msgstr "La version actuellement installée de Tor est obsolète et n'est plus re msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "Site web de Tor: %1" +msgstr "Site web de Tor : %1" msgctxt "MainWindow" msgid "" @@ -1950,13 +1964,7 @@ msgstr "Vidalia n'a pas pu installer les mises à jour de votre logiciel." msgctxt "MainWindow" msgid "The following error occurred:" -msgstr "L'erreur suivante s'est produite:" - -msgctxt "MainWindow" -msgid "" -"One of your applications%1appears to be making a potentially unencrypted and" -" unsafe connection to port %2." -msgstr "Une de vos applications%1apparaît effectuer une connexion non chiffrée et non sécurisée sur le port %2." +msgstr "L'erreur suivante s'est produite :" msgctxt "MainWindow" msgid "" @@ -1970,14 +1978,6 @@ msgid "toolBar" msgstr "Barre d'outils" msgctxt "MainWindow" -msgid "Start" -msgstr "Démarrer" - -msgctxt "MainWindow" -msgid "Stop" -msgstr "Arrêter" - -msgctxt "MainWindow" msgid "Restart" msgstr "Redémarrer" @@ -1995,6 +1995,79 @@ msgstr "Démarrage torrc de %1 à %2" msgctxt "MainWindow" msgid "" +"Vidalia tried to restart Tor, but was not able to. Please check your Task " +"Manager to ensure there are no other Tor processes running." +msgstr "Vidalia a essayé de relancer Tor, sans succès. Merci de vérifier votre Gestionnaire de tâches afin de vérifier qu'il n'existe pas un autre processus Tor en cours d'exécution." + +msgctxt "MainWindow" +msgid "Error reloading configuration" +msgstr "Erreur lors du rechargement de la configuration" + +msgctxt "MainWindow" +msgid "Vidalia was unable to reload Tor's configuration." +msgstr "Vidalia n'a pas pu relancer la configuration de Tor." + +msgctxt "MainWindow" +msgid "No dettached tabs" +msgstr "Aucun onglets détachés" + +msgctxt "MainWindow" +msgid "Panic is enabled" +msgstr "Panic est activé" + +msgctxt "MainWindow" +msgid "" +"WARNING: The Panic button is enabled. Use it carefully because it " +"will remove Tor completely." +msgstr " ATTENTION: Le bouton panique est activé. Utilisez-le avec précaution car il va supprimer Tor complètement." + +msgctxt "MainWindow" +msgid "New Circuit" +msgstr "Nouveau circuit" + +msgctxt "MainWindow" +msgid "Debug output" +msgstr "Données de sortie du débogage" + +msgctxt "MainWindow" +msgid "Panic!" +msgstr "Panique !" + +msgctxt "MainWindow" +msgid "Reattach tabs" +msgstr "Réattacher les onglets" + +msgctxt "MainWindow" +msgid "Plugins" +msgstr "Plugins" + +msgctxt "MainWindow" +msgid "Your clock is wrong" +msgstr "Votre horloge est erronée" + +msgctxt "MainWindow" +msgid "" +"Your computer's clock is wrong, tor may not work as expected. Please check " +"the Message Log for more information." +msgstr "L'horloge de votre ordinateur étant erronée, Tor peut ne pas fonctionner comme prévu. S'il vous plaît, vérifiez le journal des messages pour plus d'informations." + +msgctxt "MainWindow" +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +" %2" +msgstr "Vidalia n'arrive pas communiquer avec Tor car il n'a pas accès au fichier: %1⏎⏎\nVoici le dernier message d'erreur:⏎ %2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "Il semble Tor a cessé de fonctionner depuis Vidalia il a commencé. ⏎\n⏎\nVoir le Journal des messages avancée pour plus d'informations." + +msgctxt "MainWindow" +msgid "" "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" @@ -2008,22 +2081,22 @@ msgid "" msgstr "Vidalia a détecté que le logiciel Tor a quitté de façon inattendue.\n\nMerci de vérifier le journal des messages afin de trouver des alertes ou messages d'erreur récents." msgctxt "MainWindow" -msgid "" -"Vidalia tried to restart Tor, but was not able to. Please check your Task " -"Manager to ensure there are no other Tor processes running." -msgstr "Vidalia a essayé de relancer Tor, sans succès. Merci de vérifier votre Gestionnaire de tâches afin de vérifier qu'il n'existe pas un autre processus Tor en cours d'exécution." - -msgctxt "MainWindow" msgid "failed (%1)" msgstr "échec (%1)" msgctxt "MainWindow" -msgid ", probably Telnet," -msgstr ", probablement Telnet," +msgid "(probably Telnet)" +msgstr "(probablement Telnet)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(probablement un client de messagerie)" msgctxt "MainWindow" -msgid ", probably an email client," -msgstr ", probablement un client email," +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "Une de vos applications %1 semble se connecter de manière potentiellement non-chiffrée et non-sécurisé sur le port %2 " msgctxt "MainWindow" msgid "" @@ -2031,14 +2104,6 @@ msgid "" "Click 'Stop' again to stop your relay now." msgstr "Votre relai est en cours d'arrêt.\nCliquez 'Stop' encore une fois pour arrêter votre relai maintenant." -msgctxt "MainWindow" -msgid "Error reloading configuration" -msgstr "Erreur lors du rechargement de la configuration" - -msgctxt "MainWindow" -msgid "Vidalia was unable to reload Tor's configuration." -msgstr "Vidalia n'a pas pu relancer la configuration de Tor." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "Erreur lors de l'application d'un filtre" @@ -2109,7 +2174,7 @@ msgstr "Définir les filtres des messages" msgctxt "MessageLog" msgid "History Size..." -msgstr "Taille de l'historique..." +msgstr "Taille de l'historique…" msgctxt "MessageLog" msgid "Set maximum number of messages to display" @@ -2292,14 +2357,14 @@ msgid "Automatically save new log messages to a file" msgstr "Enregistrer les nouveaux messages automatiquement dans un fichier" msgctxt "MessageLog" -msgid "Always Save New Log Messages" -msgstr "Toujours enregistrer les nouveaux messages du Journal" - -msgctxt "MessageLog" msgid "toolbar" msgstr "Barre d'outils" msgctxt "MessageLog" +msgid "Always Save New Log Messages" +msgstr "Toujours enregistrer les nouveaux messages du Journal" + +msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." @@ -2454,13 +2519,27 @@ msgctxt "NetViewer" msgid "Status" msgstr "Etat" -msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "Passerelle invalide" +msgctxt "NetViewer" +msgid "<a href=\"server.offline\">Why is my relay offline?</a>" +msgstr "<a href=\"server.offline\">Pourquoi mon relai est-il hors-ligne ?</a>" -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "L'identifiant de la passerelle défini est invalide." +msgctxt "NetViewer" +msgid "" +"If your relay isn't listed among the others, it may be because it doesn't " +"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>" +msgstr "Si votre relai n’est pas listé parmi les autres, c’est peut-être qu’il n’a pas encore l’indicateur “Running”. <a href=\"server.consensus\">Qu’est-ce que cela ?</a>" + +msgctxt "NetViewer" +msgid "Exit circuits" +msgstr "Circuits de sortie" + +msgctxt "NetViewer" +msgid "Internal circuits" +msgstr "Circuits internes" + +msgctxt "NetViewer" +msgid "Hidden Service circuits" +msgstr "Circuits de services cachés" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" @@ -2595,13 +2674,75 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "Vous devez spécifier un ou plusieurs bridges." + +msgctxt "PluginEngine" +msgid "WARNING: %1 doesn't have an info file." +msgstr "ATTENTION : %1 n'a pas de fichier info." + +msgctxt "PluginWrapper" +msgid "%1: Processing..." +msgstr "%1: Traitement en cours…" + +msgctxt "PluginWrapper" +msgid "" +"%4: ERROR: Line: %1 - Column: %2\n" +"%3" +msgstr "%4: ERREUR: Ligne: %1 - Colonne: %2\n%3" + +msgctxt "PluginWrapper" +msgid "%1: Error opening file %2" +msgstr "%1: Erreur à l'ouverture du fichier %2" + +msgctxt "PluginWrapper" +msgid "%2: ERROR: Cannot open %1" +msgstr "%2: ERREUR: Impossible d'ouvrir %1" + +msgctxt "PluginWrapper" +msgid "%2: ERROR: Parsing %1" +msgstr "%2: ERREUR: Analyse %1" + +msgctxt "PluginWrapper" +msgid "" +"Line: %1 - Column: %2\n" +"Message: %3" +msgstr "Ligne: %1 - Colonne: %2\nMessage: %3" + +msgctxt "PluginWrapper" +msgid "%1: Starting..." +msgstr "%1: Démarrage…" + +msgctxt "PluginWrapper" +msgid "%1: Stoping..." +msgstr "%1: Stoping..." + +msgctxt "PluginWrapper" +msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" +msgstr "%1: ATTENTION: n'a pas de GUI, et buildGUI() a été appelé" + +msgctxt "PluginWrapper" +msgid "" +"%2:\n" +"*** Exception in line %1" +msgstr "%2:\n*** Exception à la ligne %1" + +msgctxt "PluginWrapper" +msgid "*** Backtrace:" +msgstr "*** Trace :" + +msgctxt "PluginWrapper" +msgid "(untitled)" +msgstr "(sans titre)" + +msgctxt "PluginWrapper" +msgid "Error: buildGUI() failed for plugin %1" +msgstr "Error: buildGUI() en erreur pour le plugin %1" + msgctxt "Policy" msgid "accept" msgstr "accepter" @@ -2610,6 +2751,36 @@ msgctxt "Policy" msgid "reject" msgstr "rejeter" +msgctxt "QDialogButtonBox" +msgid "OK" +msgstr "OK" + +msgctxt "QObject" +msgid "There were some settings that Vidalia wasn't able to apply together" +msgstr "Ils y avaient des paramètres que Vidalia n'a pas pu appliquer ensemble." + +msgctxt "QObject" +msgid "" +"Failed to set %1:\n" +"Reason: %2" +msgstr "Impossible de configurer %1:\nRaison: %2" + +msgctxt "QObject" +msgid "" +"The failed options were saved in your torrc and will be applied when you " +"restart." +msgstr "Les options erronés ont été sauvegardées dans votre fichier torrc et seront appliquées au redémarrage." + +msgctxt "QObject" +msgid "" +"The failed options were NOT saved in your torrc and will be applied when you" +" restart." +msgstr "Les options erronées ont PAS été sauvegardées dans votre fichier torrc et seront appliquées au redémarrage." + +msgctxt "QObject" +msgid "Vidalia was unable to save the options to the torrc file." +msgstr "Vidalia n'a pas réussi à sauvegarder les paramètres dans le fichier torrc." + msgctxt "RouterDescriptor" msgid "Online" msgstr "En ligne" @@ -3040,83 +3211,61 @@ msgid "" "problem with your relay. You might also include your PGP or GPG fingerprint." msgstr "Adresse email à laquelle vous pouvez être joint s'il y a un \nproblème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou GPG." -msgctxt "ServicePage" -msgid "Error while trying to unpublish all services" -msgstr "Erreur lors de la dépublication de tous les services" - -msgctxt "ServicePage" -msgid "" -"Please configure at least a service directory and a virtual port for each " -"service you want to save. Remove the other ones." -msgstr "Merci de configurer au moins un service d'annuaire et un port virtuel pour chacun des services que vous voulez sauvegarder. Supprimez les autres." - -msgctxt "ServicePage" -msgid "Error" -msgstr "Error" - -msgctxt "ServicePage" -msgid "Please select a Service." -msgstr "Merci de sélectionner un Service." - -msgctxt "ServicePage" -msgid "Select Service Directory" -msgstr "Sélectionnez le service d'annuaire" - -msgctxt "ServicePage" -msgid "Virtual Port may only contain valid port numbers [1..65535]." -msgstr "Les ports virtuels peuvent uniquement contenir des numéros de ports valides [1..65535]." +msgctxt "ServerPage" +msgid "day" +msgstr "jour" -msgctxt "ServicePage" -msgid "Target may only contain address:port, address, or port." -msgstr "La destination doit uniquement contenir addresse:port, adresse, ou port." +msgctxt "ServerPage" +msgid "week" +msgstr "semaine" -msgctxt "ServicePage" -msgid "Directory already in use by another service." -msgstr "Répertoire déjà utilisé par un autre service" +msgctxt "ServerPage" +msgid "month" +msgstr "mois" -msgctxt "ServicePage" -msgid "Provided Hidden Services" -msgstr "Services Cachés hébergés" +msgctxt "ServerPage" +msgid "Enable accounting" +msgstr "Activer le compte" -msgctxt "ServicePage" -msgid "Onion Address" -msgstr "Adresse de l'onion" +msgctxt "ServerPage" +msgid "h:mm" +msgstr "h:mm" -msgctxt "ServicePage" -msgid "Virtual Port" -msgstr "Port Virtuel" +msgctxt "ServerPage" +msgid "at" +msgstr "à" -msgctxt "ServicePage" -msgid "Target" -msgstr "Cible" +msgctxt "ServerPage" +msgid "per" +msgstr "pour" -msgctxt "ServicePage" -msgid "Directory Path" -msgstr "Chemin du dossier" +msgctxt "ServerPage" +msgid "bytes" +msgstr "octets" -msgctxt "ServicePage" -msgid "Enabled" -msgstr "Activé" +msgctxt "ServerPage" +msgid "KB" +msgstr "ko" -msgctxt "ServicePage" -msgid "Add new service to list" -msgstr "Ajouter un nouveau service à la liste" +msgctxt "ServerPage" +msgid "MB" +msgstr "Mo" -msgctxt "ServicePage" -msgid "Remove selected service from list" -msgstr "Supprimer le service selectionné de la liste" +msgctxt "ServerPage" +msgid "GB" +msgstr "Go" -msgctxt "ServicePage" -msgid "Copy onion address of selected service to clipboard" -msgstr "Copier l'adresse onion du service sélectionné dans le presse-papiers." +msgctxt "ServerPage" +msgid "TB" +msgstr "To" -msgctxt "ServicePage" -msgid "Browse in local file system and choose directory for selected service" -msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné" +msgctxt "ServerPage" +msgid "Push no more than" +msgstr "Poussez pas plus de" -msgctxt "ServicePage" -msgid "Created by Tor" -msgstr "Créé par Tor" +msgctxt "ServerPage" +msgid "time" +msgstr "temps" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3421,6 +3570,22 @@ msgid "" "started it." msgstr "Vidalia n'a pas démarré Tor. Vous devez l'arrêter depuis l'interface où vous l'avez démarré." +msgctxt "TorControl" +msgid "Start failed: %1" +msgstr "Le démarrage a échoué: %1" + +msgctxt "TorControl" +msgid "Process finished: ExitCode=%1" +msgstr "Processus terminé: CodeRetour=%1" + +msgctxt "TorControl" +msgid "Connection failed: %1" +msgstr "La connexion a échoué: %1" + +msgctxt "TorControl" +msgid "Disconnected" +msgstr "Déconnecté" + msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" msgstr "Le processus %1 ne s'est pas arrêté. [%2]" @@ -3442,12 +3607,6 @@ msgid "Editing torrc" msgstr "Edition de torrc" msgctxt "TorrcDialog" -msgid "" -"Save settings. If unchecked it will only apply settings to the current Tor " -"instance." -msgstr "Sauvegarde des paramètres. Si non cochée les réglages seront appliqués seulement à l'instance Tor actuelle." - -msgctxt "TorrcDialog" msgid "Cut" msgstr "Couper" @@ -3472,26 +3631,6 @@ msgid "Select All" msgstr "Sélectionner Tout." msgctxt "TorrcDialog" -msgid "Apply all" -msgstr "Appliquer tout" - -msgctxt "TorrcDialog" -msgid "Apply selection only" -msgstr "Appliquer seulement la sélection" - -msgctxt "TorrcDialog" -msgid "Error connecting to Tor" -msgstr "Erreur de connexion à Tor" - -msgctxt "TorrcDialog" -msgid "Selection is empty. Please select some text, or check \"Apply all\"" -msgstr "La sélection est vide. Merci de sélectionner du texte, ou cocher \"Appliquer tout\"" - -msgctxt "TorrcDialog" -msgid "Error at line %1: \"%2\"" -msgstr "Erreur à la ligne %1: \"%2\"" - -msgctxt "TorrcDialog" msgid "Error" msgstr "Error" @@ -3651,17 +3790,9 @@ msgctxt "UpdatesAvailableDialog" msgid "Version" msgstr "Version" -msgctxt "UploadProgressDialog" -msgid "Uploading Crash Report" -msgstr "Envoi du Rapport d'erreur" - -msgctxt "UploadProgressDialog" -msgid "Unable to send report: %1" -msgstr "Impossible d'envoyer le rapport: %1" - msgctxt "VMessageBox" msgid "OK" -msgstr "Ok" +msgstr "OK" msgctxt "VMessageBox" msgid "Cancel" @@ -3752,6 +3883,10 @@ msgid "Unable to open log file '%1': %2" msgstr "Impossible d'ouvrir le fichier du Journal des messages '%1': %2" msgctxt "Vidalia" +msgid "Value required for parameter :" +msgstr "Valeur requise pour le paramètre :" + +msgctxt "Vidalia" msgid "Invalid language code specified:" msgstr "Code de langue demandé invalide:" @@ -3776,7 +3911,7 @@ msgstr "%1 secondes" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "%1 B/s" +msgstr "%1 o/s" msgctxt "stringutil.h" msgid "%1 KB/s" @@ -3788,7 +3923,7 @@ msgstr "%1 Mo/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "%1 GB/s" +msgstr "%1 Go/s" msgctxt "stringutil.h" msgid "%1 days"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit a616736612ba7e7880b5748c8909ef9bda58035e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 12 ++++++------ fr/vidalia_fr.po | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9b89134..6ed7c6b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-07 12:23+0000\n" +"PO-Revision-Date: 2012-11-07 16:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -130,23 +130,23 @@ msgstr "Examinar " msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "Carpeta de Datos " +msgstr "Carpeta de Datos" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "Almacenar datos de Tor en la siguiente carpeta " +msgstr "Almacenar datos de Tor en la siguiente carpeta" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " +msgstr "Seleccione la carpeta que se usará para almacenar los datos de Tor" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor (Protocolo de)" +msgstr "Control de Tor" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "Usar conexión TCP (ControlPort) " +msgstr "Usar conexión TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index b2d6ccc..6a6ef05 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-26 09:41+0000\n" +"PO-Revision-Date: 2012-11-07 16:42+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2775,7 +2775,7 @@ msgctxt "QObject" msgid "" "The failed options were NOT saved in your torrc and will be applied when you" " restart." -msgstr "" +msgstr "Les options erronées ont PAS été sauvegardées dans votre fichier torrc et seront appliquées au redémarrage." msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." @@ -3261,7 +3261,7 @@ msgstr "To" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "Poussez pas plus de" msgctxt "ServerPage" msgid "time"

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 08ced126e6a34f7d5cfcf558ee9a592ac2a15785 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:12 2012 +0000 Update translations for orbot_completed --- values-fr/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 3807707..e5bf52e 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -75,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot est prêt!</string> @@ -105,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 5cd52437aa2a0b07fb63947b8858820a37a50c86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 16:45:08 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 3807707..e5bf52e 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -75,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n /n/n\n Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot est prêt!</string> @@ -105,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[ooni-probe/master] Implement config file support
by art＠torproject.org 07 Nov '12

07 Nov '12

commit 37221cd7bfe6fad3750ae2c701d22a7bf03b9793 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 17:06:40 2012 +0100 Implement config file support * You are able to specify basic and advanced options in YAML format --- .gitignore | 2 ++ ooni/__init__.py | 4 ++-- ooni/config.py | 36 ++++++++++++++++++++++++++++++++++++ ooni/oconfig.py | 8 -------- ooni/oonicli.py | 14 +++++++------- ooni/reporter.py | 26 +++++++++++++++++++------- ooni/runner.py | 20 ++++++++++---------- ooni/utils/geodata.py | 4 ++++ ooniprobe.conf | 19 +++++++++++++++++++ 9 files changed, 99 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 4a6b565..d1015ab 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ oonib/data/* fluff/ pcaps/ report*.yaml +docs/build/* +data/*.dat diff --git a/ooni/__init__.py b/ooni/__init__.py index 0c9f297..16b20ca 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,4 +1,4 @@ -from . import oconfig +from . import config from . import inputunit from . import kit from . import lib @@ -9,6 +9,6 @@ from . import runner from . import templates from . import utils -__all__ = ['oconfig', 'inputunit', 'kit', +__all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', 'runner', 'templates', 'utils'] diff --git a/ooni/config.py b/ooni/config.py new file mode 100644 index 0000000..97f396c --- /dev/null +++ b/ooni/config.py @@ -0,0 +1,36 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo "hellais" Filastò <art(a)fuffa.org> +# :licence: see LICENSE + +import os +import yaml + +from ooni.utils import Storage + +def get_root_path(): + this_directory = os.path.dirname(__file__) + root = os.path.join(this_directory, '..') + root = os.path.abspath(root) + return root + +config_file = os.path.join(get_root_path(), 'ooniprobe.conf') +try: + f = open(config_file) +except IOError: + raise Exception("Unable to open config file. "\ + "Create a config file called ooniprobe.conf") + +config_file_contents = '\n'.join(f.readlines()) +configuration = yaml.safe_load(config_file_contents) + +# Process the basic configuration options +basic = Storage() +for k, v in configuration['basic'].items(): + basic[k] = v + +# Process the advanced configuration options +advanced = Storage() +for k, v in configuration['advanced'].items(): + advanced[k] = v + diff --git a/ooni/oconfig.py b/ooni/oconfig.py deleted file mode 100644 index 202b569..0000000 --- a/ooni/oconfig.py +++ /dev/null @@ -1,8 +0,0 @@ -from ooni.utils import Storage - -# XXX move this to an actual configuration file -basic = Storage() -basic.logfile = '/tmp/ooniprobe.log' -advanced = Storage() - -advanced.debug = True diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 6def1df..5ee6deb 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -87,20 +87,20 @@ class Options(usage.Options, app.ReactorSelectionMixin): def run(): if len(sys.argv) == 1: sys.argv.append("--help") - config = Options() + cmd_line_options = Options() try: - config.parseOptions() + cmd_line_options.parseOptions() except usage.error, ue: raise SystemExit, "%s: %s" % (sys.argv[0], ue) - if config['debug-stacktraces']: + if cmd_line_options['debug-stacktraces']: defer.setDebugging(True) - classes = runner.findTestClassesFromConfig(config) - casesList, options = runner.loadTestsAndOptions(classes, config) + classes = runner.findTestClassesFromConfig(cmd_line_options) + casesList, options = runner.loadTestsAndOptions(classes, cmd_line_options) for idx, cases in enumerate(casesList): - orunner = runner.ORunner(cases, options[idx], config) - log.start(config['logfile']) + orunner = runner.ORunner(cases, options[idx], cmd_line_options) + log.start(cmd_line_options['logfile']) orunner.run() diff --git a/ooni/reporter.py b/ooni/reporter.py index a02e5a9..f3fbca6 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -18,6 +18,7 @@ from twisted.internet import defer from ooni.templates.httpt import BodyReceiver, StringProducer from ooni.utils import date, log, geodata +from ooni import config try: ## Get rid of the annoying "No route found for @@ -187,17 +188,28 @@ class ReporterFactory(OReporter): client_geodata = {} log.msg("Running geo IP lookup via check.torproject.org") - client_geodata['ip'] = yield geodata.myIP() - client_geodata['asn'] = 'unknown' - client_geodata['city'] = 'unknown' - client_geodata['countrycode'] = 'unknown' + client_ip = yield geodata.myIP() + if config.includeip: + client_geodata['ip'] = client_ip + else: + client_geodata['ip'] = None + + client_geodata['asn'] = None + client_geodata['city'] = None + client_geodata['countrycode'] = None try: import txtorcon client_location = txtorcon.util.NetLocation(client_geodata['ip']) - client_geodata['asn'] = client_location.asn - client_geodata['city'] = client_location.city - client_geodata['countrycode'] = client_location.countrycode + if config.includeasn: + client_geodata['asn'] = client_location.asn + + if config.includecity: + client_geodata['city'] = client_location.city + + if config.includecountry: + client_geodata['countrycode'] = client_location.countrycode + except ImportError: log.err("txtorcon is not installed. Geolocation lookup is not"\ "supported") diff --git a/ooni/runner.py b/ooni/runner.py index 102ff29..797a9d4 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -23,7 +23,7 @@ from ooni.nettest import InputTestSuite from ooni.reporter import ReporterFactory from ooni.utils import log, date -def processTest(obj, config): +def processTest(obj, cmd_line_options): """ Process the parameters and :class:`twisted.python.usage.Options` of a :class:`ooni.nettest.Nettest`. @@ -31,7 +31,7 @@ def processTest(obj, config): :param obj: An uninstantiated old test, which should be a subclass of :class:`ooni.plugoo.tests.OONITest`. - :param config: + :param cmd_line_options: A configured and instantiated :class:`twisted.python.usage.Options` class. """ @@ -63,7 +63,7 @@ def processTest(obj, config): options = Options() - options.parseOptions(config['subArgs']) + options.parseOptions(cmd_line_options['subArgs']) obj.localOptions = options if input_file: @@ -76,14 +76,14 @@ def processTest(obj, config): return obj -def findTestClassesFromConfig(config): +def findTestClassesFromConfig(cmd_line_options): """ Takes as input the command line config parameters and returns the test case classes. If it detects that a certain test class is using the old OONIProbe format, then it will adapt it to the new testing system. - :param config: + :param cmd_line_options: A configured and instantiated :class:`twisted.python.usage.Options` class. :return: @@ -91,14 +91,14 @@ def findTestClassesFromConfig(config): commandline. """ - filename = config['test'] + filename = cmd_line_options['test'] classes = [] module = filenameToModule(filename) for name, val in inspect.getmembers(module): if isTestCase(val): log.debug("Detected TestCase %s" % val) - classes.append(processTest(val, config)) + classes.append(processTest(val, cmd_line_options)) return classes def makeTestCases(klass, tests, method_prefix): @@ -112,7 +112,7 @@ def makeTestCases(klass, tests, method_prefix): cases.append(klass(method_prefix+test)) return cases -def loadTestsAndOptions(classes, config): +def loadTestsAndOptions(classes, cmd_line_options): """ Takes a list of test classes and returns their testcases and options. Legacy tests will be adapted. @@ -144,7 +144,7 @@ class ORunner(object): them in input units. I also create all the report instances required to run the tests. """ - def __init__(self, cases, options=None, config=None): + def __init__(self, cases, options=None, cmd_line_options=None): self.baseSuite = InputTestSuite self.cases = cases self.options = options @@ -168,7 +168,7 @@ class ORunner(object): self.inputs = [None] try: - reportFile = open(config['reportfile'], 'a+') + reportFile = open(cmd_line_options['reportfile'], 'a+') except TypeError: filename = 'report_'+date.timestamp()+'.yaml' reportFile = open(filename, 'a+') diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index 9f782e8..5254044 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -1,4 +1,8 @@ import re +import pygeoip + +from ooni import config + from twisted.web.client import Agent from twisted.internet import reactor, defer, protocol diff --git a/ooniprobe.conf b/ooniprobe.conf new file mode 100644 index 0000000..278dc4c --- /dev/null +++ b/ooniprobe.conf @@ -0,0 +1,19 @@ +# This is the configuration file for OONIProbe +# This file follows the YAML markup format: http://yaml.org/spec/1.2/spec.html +# Keep in mind that indentation matters. + +basic: + # Where OONIProbe should be writing it's log file + logfile: /tmp/ooniprobe.log + # Should we include the IP address of the probe in the report? + includeip: true + # Should we include the ASN of the probe in the report? + includeasn: true + # Should we include the ASN of the probe in the report? + includecountry: true + # Should we include the ASN of the probe in the report? + includecity: true +advanced: + geoip_data_dir: /home/x/code/networking/ooni-probe/data + debug: true +

1 0

[tor-design-2012/master] Add our initial work breakdown, for reference.
by nickm＠torproject.org 07 Nov '12

07 Nov '12

commit b5022a49564f60fc91df539258b05a3c3370eb93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 10:16:41 2012 -0500 Add our initial work breakdown, for reference. --- todo | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/todo b/todo new file mode 100644 index 0000000..c807072 --- /dev/null +++ b/todo @@ -0,0 +1,22 @@ +Tentative breakdown. Feel free to take on something here that isn't done +yet! + + + * Integrate the content from the first blog post [nick] ** + * Integrate content from the second blog post [steven] + * Integrate content from the third blog post [steven] + + * Revise the abstract and introduction [nick] + * Revise related work [steven] + + * Revise design goals and assumptions [steven] + * Revise tor-design up to "opening and closing streams" [nick] ** + * Revise tor-design "opening and closing streams" onward [steven] + * Revise hidden services section [nick] + + * Revise "other design decisions" [nick] + * Revise "attacks and defenses" [steven] + * Replace "early experiences: Tor in the wild" [???? Nick?] + + * Revise "open questions in low-latency anonymity" and "future + directions" [steven]

1 0

[metrics-tasks/master] Make a note for atagar's OrderedDict suggestion (#6471).
by karsten＠torproject.org 07 Nov '12

07 Nov '12

commit 44a529a4c87c4784ac4a0832cf65916a77072247 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 7 08:28:53 2012 -0500 Make a note for atagar's OrderedDict suggestion (#6471). --- task-6471/python/pygeodate.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/task-6471/python/pygeodate.py b/task-6471/python/pygeodate.py index 72f13d8..f9525f0 100644 --- a/task-6471/python/pygeodate.py +++ b/task-6471/python/pygeodate.py @@ -17,7 +17,9 @@ class Range: class Database: def __init__(self): - # TODO Replace with crit-bit tree if performance becomes a problem + # TODO Replace with crit-bit tree if performance becomes a problem; + # alternatively, use an OrderedDict which is the equivalent of + # LinkedHashMap in Java. self.data = [] self.dates = [] self.keys = []

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 36308c28d62c5a59825353fa97b0e962dd7fe65a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 12:45:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee281c1..9b89134 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-06 15:55+0000\n" +"PO-Revision-Date: 2012-11-07 12:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor " +msgstr "Control de Tor (Protocolo de)" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit bce9c2c2401f358befafd15c74f60c1a225ba03f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 12:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee281c1..9b89134 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-06 15:55+0000\n" +"PO-Revision-Date: 2012-11-07 12:23+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr "Seleccione la carpeta a usar para almacenar los datos de Tor " msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "Control de Tor " +msgstr "Control de Tor (Protocolo de)" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)"

1 0