- tor-commits - lists.torproject.org

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

06 Nov '12

commit 0274ddc06e615898c5fadf0c71f8112274ea70c6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 14:45:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 73 +++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 36 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 20aba41..ea54535 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -3,109 +3,110 @@ # <gioyik(a)gmail.com>, 2011, 2012. # <josua.falken(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <strelnic(a)gmail.com>, 2012. msgid "" 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-04-07 02:47+0000\n" -"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" -"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n" +"PO-Revision-Date: 2012-11-06 14:38+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\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" msgid "About Vidalia" -msgstr "Acerca de Vidalia" +msgstr "Acerca de Vidalia " msgctxt "AboutDialog" msgid "License" -msgstr "Licencia" +msgstr "Licencia " msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "Vidalia 0.2.0" +msgstr "Vidalia 0.2.0 " msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "Tor 0.2.0.32" +msgstr "Tor 0.2.0.32 " msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "Qt 4.4.2" +msgstr "Qt 4.4.2 " msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "'%1' no es una dirección IP válida." +msgstr "'%1' no es una dirección IP válida. " msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "Ha seleccionado autenticación por 'Contraseña', pero no ha especificado ninguna." +msgstr "Ha seleccionado autentificación por 'Contraseña', pero no ha especificado ninguna. " msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "Seleccione el Archivo de Configuración de Tor" +msgstr "Seleccione el Archivo de Configuración de Tor " msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "Archivo No Encontrado" +msgstr "Archivo No Encontrado " msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" -msgstr "%1 no existe. ¿Desea crearlo?" +msgstr "%1 no existe. ¿Desea crearlo? " msgctxt "AdvancedPage" msgid "Failed to Create File" -msgstr "Error al Crear Archivo" +msgstr "Error al Crear Archivo " msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" -msgstr "No se pudo crear %1 [%2]" +msgstr "No se pudo crear %1 [%2] " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "Seleccione un Directorio para Almacenar Datos de Tor" +msgstr "Seleccione una Carpeta para Almacenar Datos de Tor " msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "No se pudo eliminar el Servicio Tor" +msgstr "No se pudo eliminar el Servicio Tor " msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "No se pudo instalar el Servicio Tor" +msgstr "No se pudo instalar el Servicio Tor " msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "Vidalia no pudo instalar el servicio Tor." +msgstr "Vidalia no pudo instalar el servicio Tor. " msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "Autentificación:" +msgstr "Autentificación: " msgctxt "AdvancedPage" msgid "Address:" -msgstr "Dirección:" +msgstr "Dirección: " msgctxt "AdvancedPage" msgid "None" -msgstr "Ninguna" +msgstr "Ninguna " msgctxt "AdvancedPage" msgid "Cookie" -msgstr "Cookie" +msgstr "Cookie " msgctxt "AdvancedPage" msgid "Password" -msgstr "Contraseña" +msgstr "Contraseña " msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "Generar aleatoriamente" +msgstr "Generar Aleatoriamente " msgctxt "AdvancedPage" msgid ":" @@ -113,43 +114,43 @@ msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "Fichero de configuración de Tor" +msgstr "Fichero de Configuración de Tor " msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "Iniciar Tor con el archivo de configuración especificado (torrc)" +msgstr "Iniciar Tor con el archivo de configuración especificado (torrc) " msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "Seleccione la ruta a su archivo de configuración" +msgstr "Seleccione la ruta a su archivo de configuración " msgctxt "AdvancedPage" msgid "Browse" -msgstr "Examinar" +msgstr "Examinar " msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "Directorio 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 el siguiente directorio" +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 el directorio que se usará para almacenar los datos de Tor" +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 " msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "Uso de la conexión TCP (ControlPort)" +msgstr "Usar conexión TCP (ControlPort) " msgctxt "AdvancedPage" msgid "Path:" -msgstr "Ruta de acceso:" +msgstr "Ruta de acceso: " msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)"

1 0

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

06 Nov '12

commit ca543bee8e8794b555c20d66402db21c0ff4e213 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 14:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 73 +++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 36 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 20aba41..ea54535 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -3,109 +3,110 @@ # <gioyik(a)gmail.com>, 2011, 2012. # <josua.falken(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <strelnic(a)gmail.com>, 2012. msgid "" 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-04-07 02:47+0000\n" -"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" -"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n" +"PO-Revision-Date: 2012-11-06 14:38+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\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" msgid "About Vidalia" -msgstr "Acerca de Vidalia" +msgstr "Acerca de Vidalia " msgctxt "AboutDialog" msgid "License" -msgstr "Licencia" +msgstr "Licencia " msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "Vidalia 0.2.0" +msgstr "Vidalia 0.2.0 " msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "Tor 0.2.0.32" +msgstr "Tor 0.2.0.32 " msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "Qt 4.4.2" +msgstr "Qt 4.4.2 " msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "'%1' no es una dirección IP válida." +msgstr "'%1' no es una dirección IP válida. " msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "Ha seleccionado autenticación por 'Contraseña', pero no ha especificado ninguna." +msgstr "Ha seleccionado autentificación por 'Contraseña', pero no ha especificado ninguna. " msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "Seleccione el Archivo de Configuración de Tor" +msgstr "Seleccione el Archivo de Configuración de Tor " msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "Archivo No Encontrado" +msgstr "Archivo No Encontrado " msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" -msgstr "%1 no existe. ¿Desea crearlo?" +msgstr "%1 no existe. ¿Desea crearlo? " msgctxt "AdvancedPage" msgid "Failed to Create File" -msgstr "Error al Crear Archivo" +msgstr "Error al Crear Archivo " msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" -msgstr "No se pudo crear %1 [%2]" +msgstr "No se pudo crear %1 [%2] " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "Seleccione un Directorio para Almacenar Datos de Tor" +msgstr "Seleccione una Carpeta para Almacenar Datos de Tor " msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "No se pudo eliminar el Servicio Tor" +msgstr "No se pudo eliminar el Servicio Tor " msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "No se pudo instalar el Servicio Tor" +msgstr "No se pudo instalar el Servicio Tor " msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "Vidalia no pudo instalar el servicio Tor." +msgstr "Vidalia no pudo instalar el servicio Tor. " msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "Autentificación:" +msgstr "Autentificación: " msgctxt "AdvancedPage" msgid "Address:" -msgstr "Dirección:" +msgstr "Dirección: " msgctxt "AdvancedPage" msgid "None" -msgstr "Ninguna" +msgstr "Ninguna " msgctxt "AdvancedPage" msgid "Cookie" -msgstr "Cookie" +msgstr "Cookie " msgctxt "AdvancedPage" msgid "Password" -msgstr "Contraseña" +msgstr "Contraseña " msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "Generar aleatoriamente" +msgstr "Generar Aleatoriamente " msgctxt "AdvancedPage" msgid ":" @@ -113,43 +114,43 @@ msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "Fichero de configuración de Tor" +msgstr "Fichero de Configuración de Tor " msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "Iniciar Tor con el archivo de configuración especificado (torrc)" +msgstr "Iniciar Tor con el archivo de configuración especificado (torrc) " msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "Seleccione la ruta a su archivo de configuración" +msgstr "Seleccione la ruta a su archivo de configuración " msgctxt "AdvancedPage" msgid "Browse" -msgstr "Examinar" +msgstr "Examinar " msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "Directorio 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 el siguiente directorio" +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 el directorio que se usará para almacenar los datos de Tor" +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 " msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "Uso de la conexión TCP (ControlPort)" +msgstr "Usar conexión TCP (ControlPort) " msgctxt "AdvancedPage" msgid "Path:" -msgstr "Ruta de acceso:" +msgstr "Ruta de acceso: " msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)"

1 0

[ooni-probe/master] Add keyword filtering test file
by art＠torproject.org 06 Nov '12

06 Nov '12

commit 71cb3d71443dc1b28a4aa62dcd0b880e2b5f5cac Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Nov 6 13:53:38 2012 +0100 Add keyword filtering test file --- nettests/core/keyword_filtering.py | 39 ++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/nettests/core/keyword_filtering.py b/nettests/core/keyword_filtering.py new file mode 100644 index 0000000..26af327 --- /dev/null +++ b/nettests/core/keyword_filtering.py @@ -0,0 +1,39 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +from ooni.templates import httpt +class KeywordFiltering(httpt.HTTPTest): + """ + This test involves performing HTTP requests containing to be tested for + censorship keywords. + """ + name = "Keyword Filtering" + author = "Arturo Filastò" + version = 0.1 + + optParameters = [['backend', 'b', None, 'URL of the backend system to use for testing']] + + inputFile = ['file', 'f', None, 'List of keywords to use for censorship testing'] + + def processInputs(self): + if 'backend' in self.localOptions: + self.url = self.localOptions['backend'] + else: + raise Exception("No backend specified") + + def test_get(self): + """ + Perform a HTTP GET request to the backend containing the keyword to be + tested inside of the request body. + """ + return self.doRequest(self.url, method="GET", body=self.input) + + def test_post(self): + """ + Perform a HTTP POST request to the backend containing the keyword to be + tested inside of the request body. + """ + return self.doRequest(self.url, method="POST", body=self.input) +

1 0

[ooni-probe/master] Implement keyword filtering detection tool
by art＠torproject.org 06 Nov '12

06 Nov '12

commit a5e0b372a326e2b7daa2a350a821ced13271b170 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Nov 6 13:43:01 2012 +0100 Implement keyword filtering detection tool * Fix some bugs in reporter and runner --- ooni/reporter.py | 5 +++-- ooni/runner.py | 1 + ooni/templates/httpt.py | 22 ++++++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 69f0092..8c0b593 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -194,11 +194,11 @@ class ReporterFactory(OReporter): try: import txtorcon - client_location = txtorcon.util.NetLocation(client_ip) + 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 - except: + except ImportError: log.err("txtorcon is not installed. Geolocation lookup is not"\ "supported") @@ -255,6 +255,7 @@ class OONIReporter(OReporter): self._tests[idx] = {} self._tests[idx]['test_started'] = self._getTime() + if isinstance(test.input, packet.Packet): test_input = repr(test.input) else: diff --git a/ooni/runner.py b/ooni/runner.py index acf5519..e1ecaac 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -73,6 +73,7 @@ def processTest(obj, config): if obj.optFlags: log.debug("Got optFlags") optFlags = obj.optFlags + options = Options() options.parseOptions(config['subArgs']) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 5c7d552..0b0b7cb 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -96,8 +96,12 @@ class HTTPTest(NetTestCase): self.request = {} self.response = {} + self.processInputs() log.debug("Finished test setup") + def processInputs(self): + pass + def _processResponseBody(self, data, body_processor): log.debug("Processing response body") self.response['body'] = data @@ -152,11 +156,8 @@ class HTTPTest(NetTestCase): This function takes the response body as an argument. """ log.debug("Performing request %s %s %s" % (url, method, headers)) - try: - d = self.build_request(url, method, headers, body) - except Exception, e: - print e - self.report['error'] = e + + d = self.build_request(url, method, headers, body) def errback(data): log.err("Error in test %s" % data) @@ -205,13 +206,22 @@ class HTTPTest(NetTestCase): self.request['url'] = url self.request['headers'] = headers if headers else {} self.request['body'] = body + if self.randomizeUA: self.randomize_useragent() self.report['request'] = self.request self.report['url'] = url + + # If we have a request body payload, set the request body to such + # content + if body: + body_producer = StringProducer(self.request['body']) + else: + body_producer = None + req = self.agent.request(self.request['method'], self.request['url'], Headers(self.request['headers']), - self.request['body']) + body_producer) return req

1 0

[ooni-probe/master] Fix bug in scapy test template
by art＠torproject.org 06 Nov '12

06 Nov '12

commit 85ff8f2daf527d81da69d5e3af84f7e97e6fe579 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Nov 6 00:34:18 2012 +0100 Fix bug in scapy test template * Add debug lines to scapyt --- nettests/examples/example_scapyt.py | 1 + ooni/lib/txscapy.py | 15 +++++++++++---- ooni/templates/scapyt.py | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/nettests/examples/example_scapyt.py b/nettests/examples/example_scapyt.py index cda3a10..ce32ac3 100644 --- a/nettests/examples/example_scapyt.py +++ b/nettests/examples/example_scapyt.py @@ -3,6 +3,7 @@ # :authors: Arturo Filastò # :licence: see LICENSE +from ooni.utils import log from ooni.templates import scapyt from scapy.all import * diff --git a/ooni/lib/txscapy.py b/ooni/lib/txscapy.py index d4f146e..4446be0 100644 --- a/ooni/lib/txscapy.py +++ b/ooni/lib/txscapy.py @@ -24,6 +24,8 @@ from zope.interface import implements from scapy.all import Gen from scapy.all import SetGen +from ooni.utils import log + LINUX=sys.platform.startswith("linux") OPENBSD=sys.platform.startswith("openbsd") FREEBSD=sys.platform.startswith("freebsd") @@ -260,6 +262,7 @@ class Scapy(object): self.socket.send(pkt) def timeout(self, *arg, **kw): + log.debug("Caught a timeout with %s %s" % (arg, kw)) if not self.done: self._reactor.callLater(self.timeoutSeconds, self.timeout, None) else: @@ -284,6 +287,7 @@ class Scapy(object): @param filter: provide a BPF filter @param iface: listen answers only on the given interface """ + log.debug("Calling with %s" % pkts) self.recv = True if timeout: self.timeoutSeconds = timeout @@ -356,15 +360,18 @@ class Scapy(object): self.running = False @defer.inlineCallbacks -def txsr(*args, **kw): - tr = Scapy(*args, **kw) - tr.sr(*args, **kw) +def txsr(*arg, **kw): + tr = Scapy(*arg, **kw) + log.debug("Calling sr with %s, %s" % (arg, kw)) + tr.sr(*arg, **kw) yield tr.deferred tr.finalClose() @defer.inlineCallbacks def txsend(*arg, **kw): - tr = Scapy(*arg, **kw) + tr = Scapy(**kw) + log.debug("Calling send with %s, %s" % (arg, kw)) tr.send(*arg, **kw) yield tr.deferred tr.finalClose() + diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 1b19dbf..8751587 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -45,7 +45,7 @@ class ScapyTest(NetTestCase): self.reactor.stop() def sendReceivePackets(self, *kw): - d = txsr(packets=self.request, pcapfile=self.pcapfile, + d = txsr(self.request, pcapfile=self.pcapfile, timeout=self.timeout, reactor=self.reactor) return d

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 06 Nov '12

06 Nov '12

commit 780e78a48971e5392da811f7b8cc98b90e526068 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 08:15:55 2012 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 0b16c2c..b6a028c 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # Anatoliy Guskov <anatoliy.guskov(a)gmail.com>, 2009. +# Den Arefyev <>, 2012. # <vlasok1987(a)yandex.ru>, 2012. # Yulia <ypoyarko(a)redhat.com>, 2009. msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-04 10:15+0000\n" -"Last-Translator: vlasok <vlasok1987(a)yandex.ru>\n" +"PO-Revision-Date: 2012-11-06 07:52+0000\n" +"Last-Translator: Den Arefyev <>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -332,7 +333,7 @@ msgstr "" #: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "Removing %(file)s" #: ../liveusb/creator.py:1017 #, python-format

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 06 Nov '12

06 Nov '12

commit c1608540fed6ac4b1bec073520aecedd3340a4f7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 07:16:03 2012 +0000 Update translations for torbirdy --- ru/torbirdy.dtd | 24 ++++++++++++------------ ru/torbirdy.properties | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 142eac3..37903f7 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -1,34 +1,34 @@ -<!ENTITY torbirdy.accountprefs.title ""> +<!ENTITY torbirdy.accountprefs.title "Конфигурация аккаунта"> <!ENTITY torbirdy.accountprefs.startup.label ""> <!ENTITY torbirdy.accountprefs.startup.key ""> <!ENTITY torbirdy.accountprefs.minutes.label ""> <!ENTITY torbirdy.accountprefs.minutes.key ""> <!ENTITY torbirdy.accountprefs.minutes.trail.label ""> -<!ENTITY torbirdy.accountprefs.cancel.button ""> -<!ENTITY torbirdy.accountprefs.save.button ""> +<!ENTITY torbirdy.accountprefs.cancel.button "Отмена"> +<!ENTITY torbirdy.accountprefs.save.button "Сохранить"> <!ENTITY torbirdy.accountprefs.save.key ""> <!ENTITY torbirdy.prefs.title ""> -<!ENTITY torbirdy.prefs.save.button ""> +<!ENTITY torbirdy.prefs.save.button "Сохранить"> <!ENTITY torbirdy.prefs.save.key ""> -<!ENTITY torbirdy.prefs.cancel.button ""> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.cancel.button "Отмена"> +<!ENTITY torbirdy.prefs.extra2.button "Настройки теста"> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.proxy.label "Настройки Прокси"> +<!ENTITY torbirdy.prefs.privacy.label "Настройки приватности"> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key ""> <!ENTITY torbirdy.prefs.anonservice.text ""> <!ENTITY torbirdy.prefs.anonservice.key ""> <!ENTITY torbirdy.prefs.customsettings.text ""> <!ENTITY torbirdy.prefs.customsettings.key ""> -<!ENTITY torbirdy.prefs.socks_host.label ""> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS хост: "> <!ENTITY torbirdy.prefs.socks_host.key ""> -<!ENTITY torbirdy.prefs.socks_port.label ""> +<!ENTITY torbirdy.prefs.socks_port.label "Порт:"> <!ENTITY torbirdy.prefs.socks_port.key ""> <!ENTITY torbirdy.prefs.torification.label ""> <!ENTITY torbirdy.prefs.torification.key ""> -<!ENTITY torbirdy.prefs.global ""> +<!ENTITY torbirdy.prefs.global "Глобальные"> <!ENTITY torbirdy.prefs.imap.label ""> <!ENTITY torbirdy.prefs.imap.key ""> <!ENTITY torbirdy.prefs.startup_folder.label ""> @@ -37,4 +37,4 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key ""> <!ENTITY torbirdy.prefs.account_specific ""> <!ENTITY torbirdy.prefs.select_account.key ""> -<!ENTITY torbirdy.prefs.select_account.label ""> +<!ENTITY torbirdy.prefs.select_account.label "Выберите аккаунт:"> diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties index 59ef3a7..5c07aa4 100644 --- a/ru/torbirdy.properties +++ b/ru/torbirdy.properties @@ -1,13 +1,13 @@ -# torbirdy.name=TorBirdy +torbirdy.name=TorBirdy # torbirdy.enabled.tor=TorBirdy Enabled: Tor # torbirdy.enabled.jondo=TorBirdy Enabled: JonDo # torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy # torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification -# torbirdy.disabled=TorBirdy: Disabled! +torbirdy.disabled=TorBirdy: Отключено! # torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. # torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time -# torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз +torbirdy.email.advanced.title=TorBirdy расширенные настройки

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Nov '12

06 Nov '12

commit 00b0db2f0f194c5735529751d000fb1f70505c02 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 07:15:58 2012 +0000 Update translations for tails-persistence-setup --- ru/ru.po | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index da30d15..23e6bda 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Den Arefyev <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-10-03 16:16+0200\n" -"PO-Revision-Date: 2012-10-03 17:39+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2012-10-29 19:33+0100\n" +"PO-Revision-Date: 2012-11-06 07:11+0000\n" +"Last-Translator: Den Arefyev <>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH Клиент" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" @@ -43,7 +44,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -166,7 +167,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" -msgstr "" +msgstr "Ошибка" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" @@ -197,7 +198,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "Создать" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -227,7 +228,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 msgid "Failed" -msgstr "" +msgstr "Ошибка" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 @@ -273,7 +274,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save" -msgstr "" +msgstr "Сохранить" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" @@ -285,7 +286,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..." -msgstr "" +msgstr "Сохранение..." #: ../lib/Tails/Persistence/Step/Configure.pm:207 msgid "Saving persistence configuration..." @@ -307,11 +308,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "Удалить" #: ../lib/Tails/Persistence/Step/Delete.pm:99 msgid "Deleting..." -msgstr "" +msgstr "Удаление..." #: ../lib/Tails/Persistence/Step/Delete.pm:102 msgid "Deleting the persistent volume..."

1 0

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

06 Nov '12

commit 35025ba3d5a96dac5ef7acdde905e44f90b0f20c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 07:15:12 2012 +0000 Update translations for orbot_completed --- values-ru/strings.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 81078b2..5cbf7a6 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Остановить</string> <string name="menu_about">О программе</string> <string name="menu_wizard">Мастер</string> + <string name="main_layout_download">Загрузить</string> + <string name="main_layout_upload">Загрузить</string> <string name="button_help">Справка</string> <string name="button_close">Закрыть</string> <string name="button_about">О программе</string> @@ -72,6 +74,12 @@ <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> + <string name="wizard_tips_duckgo">Приложение поисковой системы Duckduckgo</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Firefox с дополнением Proxy Mobile (после отдельной установки)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="wizard_tips_twitter">Twitter поддерживает 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">Настройки Прокси</string> <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\n Значение хоста - 127.0.0.1 или \"localhost\". Для HTTP, номер порта - 8118. Для SOCKS прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n\n \n Вы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Программа Orbot готова к использованию!</string> @@ -100,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) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_tips_play">Найти все приложения Guardian Project на 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 06 Nov '12

06 Nov '12

commit a68b74206fa2c9d4c5a7dad30dc48be372580122 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 6 07:15:09 2012 +0000 Update translations for orbot --- values-ru/strings.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/values-ru/strings.xml b/values-ru/strings.xml index aa89294..5cbf7a6 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Остановить</string> <string name="menu_about">О программе</string> <string name="menu_wizard">Мастер</string> + <string name="main_layout_download">Загрузить</string> + <string name="main_layout_upload">Загрузить</string> <string name="button_help">Справка</string> <string name="button_close">Закрыть</string> <string name="button_about">О программе</string> @@ -73,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> <string name="wizard_tips_duckgo">Приложение поисковой системы Duckduckgo</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox с дополнением Proxy Mobile (после отдельной установки)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter поддерживает 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">Настройки Прокси</string> <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\n Значение хоста - 127.0.0.1 или \"localhost\". Для HTTP, номер порта - 8118. Для SOCKS прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n\n \n Вы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Программа Orbot готова к использованию!</string> @@ -103,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) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_tips_play">Найти все приложения Guardian Project на 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