tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

[bridgedb/develop] Merge branch 'fix/12122-translator-notes' into develop
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 46ab59e8a4929ead2b638f0e6444343588c58bfa Merge: e7b3d6e 1890058 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:51:55 2014 +0000 Merge branch 'fix/12122-translator-notes' into develop lib/bridgedb/i18n/templates/bridgedb.pot | 73 +++++++++++++++++------------- lib/bridgedb/strings.py | 7 +++ lib/bridgedb/templates/bridges.html | 4 +- 3 files changed, 52 insertions(+), 32 deletions(-)

1 0

[bridgedb/develop] Update Spanish (es) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit fa2a25cab52ccda3496d4f556bf729b191c07b70 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 19:49:12 2014 +0000 Update Spanish (es) translations. * THANKS to dark_yoshi and strel. --- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 340 ++++++++++++++++++++++---- 1 file changed, 287 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po index 014b96d..dd24d43 100644 --- a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po @@ -1,19 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: +# dark_yoshi <angelargi(a)yahoo.es>, 2014 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Envite <envite(a)rolamasao.org>, 2013 -# strel <strelnic(a)gmail.com>, 2013 -# strel <strelnic(a)gmail.com>, 2012 +# strel, 2013-2014 +# strel, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-30 21:53+0000\n" -"Last-Translator: Envite <envite(a)rolamasao.org>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-05-17 18:12+0000\n" +"Last-Translator: strel\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" @@ -22,82 +23,315 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "¡Lo sentimos! Algo fue mal con su solicitud." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Este es un mensaje automático; por favor no responda.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Aquí están sus bridges:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Ha superado el límite. Por favor, ¡más despacio! El tiempo mínimo entre mensajes de correo\nelectrónico es %s horas. Se ignoran todos los correos adicionales durante este período de tiempo." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combine COMMANDs (comandos) para especificar múltiples opciones simultáneamente)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "¡Bienvenido a BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "TYPEs (tipos) de 'transport' (transportes) soportados:" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "¡Eh, %s!" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "¡Hola amigo!" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Claves públicas" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Este correo electrónico fue generado con arcos iris, unicornios, y centellas\npara %s el %s a las %s." + +#: lib/bridgedb/strings.py:42 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB (base de datos de repetidores puente) puede proporcionar bridges con\nvarios %stipos de Pluggable Transports%s (transportes conectables), que pueden\nayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil que\nalguien vea su tráfico de Internet para determinar que está utilizando Tor.\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "También hay disponibles varios bridges con direcciones IPv6, aunque algunos\nPluggable Trasnports no son compatibles con IPv6.\n\n" + +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\ntodavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n" + +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "¿Qué son los puentes ('bridges')?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:66 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "Los %s repetidores puente %s ('bridge relays') son un tipo de repetidores Tor que pueden ayudarle a evitar la censura." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "Los %s bridges %s son un tipo de repetidores Tor que le ayudan a eludir la censura." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "¡Necesito un modo alternativo de conseguir puentes!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Otra forma de encontrar direcciones de puentes ('bridges') de acceso público es enviar un correo (desde una dirección %s o una %s) a %s con la línea 'get bridges' por si sola en el cuerpo del correo." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrónico usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s o %s" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Si su Tor no funciona, debe enviar un correo a %s" + +#: lib/bridgedb/strings.py:81 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Intente incluir tanta información sobre su caso como pueda, incluyendo la lista de\nbridges (repetidores puente) y Pluggable Transports (transportes conectables) que\ntrató de usar, su versión del Navegador Tor, cualquier mensaje que Tor le diera, etc." + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "Aquí tiene sus líneas de bridge:" + +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "¡Conseguir bridges!" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "Por favor seleccione las opciones para el tipo de bridge:" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "¿Necesita direcciones IPv6?" + +#: lib/bridgedb/strings.py:95 #, python-format +msgid "Do you need a %s?" +msgstr "¿Necesita un %s?" + +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "Su navegador no está mostrando las imágenes correctamente." + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "Introduzca los caracteres de la imagen de arriba..." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "Cómo comenzar a usar sus bridges" + +#: lib/bridgedb/strings.py:105 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Para introducir bridges (repetidores puente) en el Navegador Tor, siga las\ninstrucciones de la %s página de descarga del Navegador Tor %s para iniciarlo." + +#: lib/bridgedb/strings.py:108 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Si su Tor no funciona, debe enviar un correo a %s. Intente incluir tanta información acerca de su caso como pueda, incluyendo la lista de puentes ('bridges') que utilizó, el nombre de archivo/versión del paquete que tenía instalado, los mensajes que Tor emitió, etc." +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Cuando el cuadro de 'Configuraciones de red Tor' aparezca, haga clic en 'Configurar'\ny siga el asistente hasta que le pregunte:" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:111 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Para usar las líneas anteriores, vaya a la página de Preferencias de red de Vidalia, y haga clic en \"Mi ISP bloquea conexiones a la red Tor\". Añada entonces cada dirección de puente ('bridge'), una cada vez." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "¿Su proveedor de Internet (ISP) bloquea o censura de alguna manera conexiones a la red Tor?" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Seleccione 'Sí' y luego haga clic en 'Siguiente'. Para configurar sus nuevos\nbridges, copie y pegue las líneas de bridges en el campo de entrada de texto.\nPor último, haga clic en 'Conectar', ¡y debe estar listo para funcionar!\nSi experimenta problemas, pruebe a hacer clic en el botón de 'Ayuda'\nen el asistente de 'Configuraciones de red Tor' para asistencia adicional." + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "Muestra este mensaje." + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "Solicitar bridges estándar (vanilla)." + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "Solicitar bridges IPv6." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Solicitar un Pluggable Transport por TYPE." + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Informar de un fallo" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Código fuente" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "No hay puentes ('bridges') disponibles actualmente." +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Registro de cambios" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Actualice su navegador a Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contactar" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Teclee las dos palabras" +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "Oh oh, ¡la liamos!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Paso 1" +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "Ahora mismo no hay ningún bridge disponible..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:71 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Obtenga el %s Paquete de Navegador Tor %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "¡A lo mejor debería probar %s volviendo atrás %s y eligiendo un tipo diferente de bridge!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Paso %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Paso 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Descargar el %s Navegador Tor %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Paso %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Obtenga los %s puentes ('bridges') %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Paso 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Paso %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Ahora %s añada los bridges al Navegador Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "¡%sS%sólo deme los bridges!" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "Opciones avanzadas" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "No" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "ninguno" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "¡%sS%sí!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Ahora %s añada los puentes a Tor %s" +msgid "%sG%set Bridges" +msgstr "%sC%sonseguir bridges"

1 0

[bridgedb/develop] Update Danish (da) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit ba817fead9057363f15d7ab9de57313c4e41249a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 18:14:20 2014 +0000 Update Danish (da) translations. * THANKS to autofunk78 and DavidNielsen --- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 371 ++++++++++++++++++++++---- 1 file changed, 319 insertions(+), 52 deletions(-) diff --git a/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po index 534c8dc..bef23e0 100644 --- a/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po @@ -1,18 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: +# autofunk78 <villum(a)autofunk.dk>, 2014 +# DavidNielsen <gnomeuser(a)gmail.com>, 2014 # OliverMller <theoliver(a)live.co.uk>, 2011 # torebjornson <tore.bjornson(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-06-30 06:20+0000\n" -"Last-Translator: torebjornson <tore.bjornson(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-06-06 18:13+0000\n" +"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +22,348 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "Undskyld, noget gik galt med din anmodning." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Dette er en automatisk meddelelse; Svar venligst ikke.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Her er dine broer:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" +"Du har overskredet ratebegrænsningen. Sænk venligst hastigheden! Den minimale\n" +"tid mellem emails er %s timer. Yderligere emails sendt i denne period vil\n" +"blive ignoreret." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder på en gang)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "Velkommen til BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "Transport TYPEs som er understøttet i øjeblikket:" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "Hej %s!" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "Hej min ven!" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Offentlige nøgler" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" +"Denne email til %s blev skabt ved hjælp af regnbuer,\n" +"enhjørninger og glitter %s klokken %s." + +#: lib/bridgedb/strings.py:42 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "" +"BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s\n" +"som kan hjælpe med at sløre dine forbindelser til Tor netværket, og dermed\n" +"gøre det vanskeligere for nogen som kan se din internet trafik at bestemme\n" +"at du bruger Tor.\n" +"\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" +"Nogle broer med IPv6 adresser er også tilgængelige, men ikke alle Pluggable\n" +"Transports understøtter IPv6.\n" +"\n" + +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" +"BridgeDB har ydermere masser af konventionelle broer %s uden nogen\n" +"Pluggable Transports %s hvilket måske ikke lyder så smart, men de\n" +"kan stadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n" +"\n" + +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "Hvad er broer?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:66 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bro relæer %s er Tor relæer der hjælper Dem med at undgå censur." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s broer %s er Tor relæer som hjælper dig med at omgå censur." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "Jeg har brug for en alternativ metode til at få broer på!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "En anden måde at finde offentlige bro adresser på, er at sende en email (fra en %s eller en %s adresse) til %s kun indeholdende linjen 'få broer' i selve mailen." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "" +"En anden måde at finde broer er at sende en email til %s. Bemærk venligst\n" +"at du skal sende emailen fra en konto hos en af de følgende email udbydere:\n" +"%s eller %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "Mine broer virker ikke! Jeg har brug for hjælp!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Hvis Tor ikke virker for dig kan du sende en email til %s." + +#: lib/bridgedb/strings.py:81 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" +"Prøv at inkluderer så meget information om din sag som muligt, der i blandt:\n" +"En liste af broer og Pluggable Transports du har prøvet at bruge, din Tor\n" +"Browser version, hvilke beskeder Tor gav, etc." + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "Her er dine bro linjer:" + +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "Find broer!" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "Vælg venligst brotype muligheder:" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "Har du brug for IPv6 adresser?" + +#: lib/bridgedb/strings.py:95 +#, python-format +msgid "Do you need a %s?" +msgstr "Har du brug for en %s?" + +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "Din browser kan ikke vise billeder korrekt." + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "Indtast tegnene fra billedet ovenfor..." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "Sådan starter du med at bruge dine broer" + +#: lib/bridgedb/strings.py:105 #, python-format msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Hvis dine Tor broer ikke virker, så email %s. Inkludér venligst mest mulig information om Deres sag, f.eks. hvilke broer De har brugt, versionsnummereret på den software bundle De bruger og eventuelle beskeder som Tor gav." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "" +"For at tilføje broer til Tor Browseren, følg instruktionerne på %s Tor\n" +"Browserens hjemmeside %s for at starte Tor Browser." + +#: lib/bridgedb/strings.py:108 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "" +"Når 'Tor netværksindstillinger' vinduet popper op, klik 'Indstil' og følg\n" +"guiden til den siger:" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:111 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "For at bruge ovenstående linjer, gå da til Vidalias netværksindstillinger side, og klik på \"Min Internet Udbyder blokerer forbindelse til Tor netværket\". Tilføj efterfølgende hver enkelt bro én ad gangen." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor netværket?" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" +"Vælg 'Ja' og klik så på 'Næste'. For at konfigurere dine nye broer, kopier og\n" +"indsæt brolinierne i den næste input boks. Klik til sidst 'Forbind', og så er\n" +"du klar! Hvis du støder på problemer, så prøv at klikke på 'Hjælp'-knappen i\n" +"'Tor Netværksindstillinger'-guiden for at få yderligere hjælp." + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "Vis denne besked." + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "Anmod almindelige broer." + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "Amod IPv6 broer." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Anmod om Pluggable Transport efter TYPE." + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle." -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Ingen broer er tilgængelige." +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Rapporter en fejl" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Opgrader Deres Firefox browser" +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Kildekode" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Indtast de to ord" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Ændringer" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Første skridt" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kontakt" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "Ups, vi står i lort til halsen" + +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "Der er i øjeblikket ingen tilgængelige broer..." + +#: lib/bridgedb/templates/bridges.html:71 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" +"Du kunne måse prøve %s at gå tilbage %s og vælge en anden\n" +"brotype!" + +#: lib/bridgedb/templates/index.html:11 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Få %s Tor Browser Bundlen %s" +msgid "Step %s1%s" +msgstr "Trin %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Andet skridt" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Hent %s Tor Browseren %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Trin %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Få %s broer %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Tredje skridt" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Trin %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Tilføj nu %s broer til Tor Browseren %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sB%sare giv mig bridges!" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "Advancerede indstillinger" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "Nej" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "ingen" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "%sJ%sa!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Addér nu %s broer til Tor %s" +msgid "%sG%set Bridges" +msgstr "%sH%sent Bridges"

1 0

[bridgedb/develop] Update Canadian French (fr_CA) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 81ad2024a867be5d85ab16754053ddb07eb30c1b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 19:49:56 2014 +0000 Update Canadian French (fr_CA) translations. * THANKS to Lunar. --- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 334 +++++++++++++++++++---- 1 file changed, 283 insertions(+), 51 deletions(-) diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po index 7b665d1..fb9aac7 100644 --- a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -1,9 +1,8 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: # lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 @@ -11,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-01-01 21:00+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-05-29 15:20+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -23,82 +22,315 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "Désolé! Quelque chose a mal tourné avec votre requête." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ceci est un message automatisé; veuillez ne pas répondre.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Voici vos ponts :" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Vous avez dépassé la limite. Veuillez ralentir! La durée minimum entre courriels\nest de %s heures. Tout autre courriel durant cette période sera ignoré." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDES : (combinez les COMMANDES pour spécifier plusieurs options simultanément)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "Bienvenue à BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "TYPES de transport pris en charge présentement :" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "Allô, %s!" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "Bonjour l'ami!" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Clefs publiques" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Ce courriel a été généré avec des arcs en ciel, des unicornes et des paillettes pour %s le %s à %s." + +#: lib/bridgedb/strings.py:42 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichable%s,\npouvant aider à obscurcir vos connexions au réseau Tor, rendant difficile pour\nquiconque surveillant votre trafic Internet de déterminer que vous\nutilisez Tor.\n\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Des ponts avec des adresses IPv6 sont aussi disponibles, bien que des transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" + +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "De plus, BridgeDB comportent de nombreux ponts %s traditionnels sans\ntransport enfichable %s qui peuvent quand même aider à contourner\nla censure Internet dans bien des cas.\n\n" + +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "Que sont les ponts?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:66 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Les ponts relais %s sont des relais Tor qui vous aident à contourner la censure." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Les ponts %s sont des relais Tor qui vous aident à contourner la censure." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "J'ai besoin d'une alternative pour obtenir des ponts!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Une autre manière de trouver des adresses publiques de pont est d'envoyer un courriel (à partir d'une adresse %s ou %s) à %s avec la ligne « get bridges » seule dans le corps du courriel." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s ou %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "Mes ponts ne fonctionnent pas, j'ai besoin d'aide!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %s." + +#: lib/bridgedb/strings.py:81 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Si votre Tor ne fonctionne pas, envoyer un courriel à %s. Essayer d'inclure autant d'informations que possible concernant votre cas, incluant la liste des ponts utilisés, le nom de fichier et la version de l'offre groupée, les messages donnés par Tor, etc..." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la liste de\nponts et de transports enfichables que vous avez essayé d'utiliser, votre version du\nnavigateur Tor et tout message donné par Tor, etc..." + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "Voici vos lignes de ponts :" + +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "Obtenir des ponts!" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "Veuillez choisir des options pour le type de ponts :" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "Avez-vous besoin d'adresses IPv6?" + +#: lib/bridgedb/strings.py:95 +#, python-format +msgid "Do you need a %s?" +msgstr "Avez-vous besoin d'un %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "Votre navigateur n'affiche pas les images correctement." + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "Saisir les caractères inscrits sur l'image ci-dessus..." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "Comment commencer à utiliser vos ponts" + +#: lib/bridgedb/strings.py:105 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Pour utiliser les lignes ci-dessus, aller dans l'onglet des paramètres réseau de Vidalia et cocher « Mon FAI bloque les connexions au réseau Tor ». Puis ajouter les adresses de chaque pont une à la fois." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Pour saisir vos ponts dans le navigateur Tor, suivez les instructions\nsur la %s page de téléchargement du navigateur Tor %s pour démarrer le navigateur Tor." + +#: lib/bridgedb/strings.py:108 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Quand la fenêtre « Paramètres réseau de Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" + +#: lib/bridgedb/strings.py:111 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il\nvos connexions au réseau Tor?" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de ponts dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "Affiche ce message." + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "Demander des ponts traditionnels." + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "Demander des ponts IPv6." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Demander un transport enfichable par TYPE." + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Rapporter un bogue" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Code source" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Aucune pont disponible présentement." +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Journal des changements" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Changer votre navigateur pour Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contact" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Taper les deux mots" +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "Une erreur est survenue!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Étape 1" +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "Il n'y a présentement aucun pont disponible..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:71 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Obtenir %s l'offre groupée de navigation Tor %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Vous devriez peut-être %s revenir en arrière %s et choisir un différent type de pont!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Étape %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Étape 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Télécharger %s le navigateur Tor %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Étape %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Obtenir %s les ponts %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Étape 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Étape %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "Donnez-moi %sj%suste des ponts! " + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "Options avancées" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "Non" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "aucun" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "%sO%sui!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Maintenant %s ajouter les ponts à Tor %s" +msgid "%sG%set Bridges" +msgstr "%sO%sbtenir des ponts"

1 0

[bridgedb/develop] Update Italian (it) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit adb619ae4d89cf720ef34716c6c4ea03a190795c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 19:51:16 2014 +0000 Update Italian (it) translations. * THANKS to Random_R. --- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 345 ++++++++++++++++++++++---- 1 file changed, 292 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index 923e096..ba7d480 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -1,20 +1,26 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: +# fetidyoo <tru74368(a)yahoo.com>, 2011 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # ironbishop <ironbishop(a)fsfe.org>, 2011 +# ironbishop <ironbishop(a)fsfe.org>, 2011 +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# Luca Marzo <luca(a)jeckodevelopment.it>, 2011 +# n0on3 <a.n0on3(a)gmail.com>, 2011 +# Paolo Stivanin <paolostivanin(a)gmail.com>, 2014 # Random_R, 2013 +# Random_R, 2013-2014 # fetidyoo <tru74368(a)yahoo.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-04-24 12:26+0000\n" -"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-05-20 15:51+0000\n" +"Last-Translator: Paolo Stivanin <paolostivanin(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,82 +29,315 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Questo è un messaggio automatico, si prega di non rispondere.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Ecco i tuoi bridge:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Hai superato il limite massimo. Per favore rallenta! Il tempo minimo tra le email\nè di %s ore. Tutte le altre email durante questo periodo di tempo verranno ignorate." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "Benvenuto/a su BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "Transport TYPEs attualmente supportati:" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "Hey, %s!" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "Ciao amico!" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Chiavi Pubbliche" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s." + +#: lib/bridgedb/strings.py:42 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB può fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiù difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni Pluggable\nTransports non siano compatibili con IPv6.\n\n" + +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n" + +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "Cosa sono i bridge?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:66 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere la censura." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "Mi serve un altro modo per avere dei bridge!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Un altro metodo per trovare bridge pubblici è di inviare una email (da un %s o un indirizzo %s) a %s contenente la sola frase \"get bridges\"." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "I miei bridge non funzionano! Mi serve aiuto!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Se Tor non ti funziona, manda un'email a %s." + +#: lib/bridgedb/strings.py:81 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Se il tuo Tor non funziona, manda una email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Cerca di includere più informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc." + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "Ecco le tue linee bridge:" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "Ottieni dei Bridge!" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "Seleziona le opzioni per il tipo di bridge:" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "Ti servono indirizzi IPv6?" + +#: lib/bridgedb/strings.py:95 +#, python-format +msgid "Do you need a %s?" +msgstr "Ti serve un %s?" + +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "Il tuo browser non mostra le immagini in modo corretto." + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "Inserisci i caratteri nell'immagine sopra..." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "Come iniziare a usare i tuoi bridge" + +#: lib/bridgedb/strings.py:105 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Per inserire i bridge nel Tor Browser, segui le istruzioni nella %s pagina\ndi download di Tor Browser %s per avviare Tor Browser." + +#: lib/bridgedb/strings.py:108 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchè non chiede:" + +#: lib/bridgedb/strings.py:111 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Per utilizzare le righe precedenti, vai alla pagina Impostazioni di rete di Vidalia e fai click su \"Il mio ISP blocca le connessioni alla rete Tor\". Quindi aggiungi l'indirizzo di ciascun bridge, uno alla volta." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Seleziona 'Sì' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza." + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "Mostra questo messaggio." + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "Richiedi bridge vanilla." + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "Richiedi bridge IPv6." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Richiedi un Pluggable Transport by TYPE." + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Segnala un Errore" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Al momento non sono disponibili bridge" +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Codice Sorgente" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Aggiorna il tuo browser a Firefox" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Changelog" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Digita le due parole" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contatti" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Passo 1" +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "Non ci sono bridge disponibili al momento..." + +#: lib/bridgedb/templates/bridges.html:71 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Scarica %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Passo %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Passo 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Scarica %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Passo %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Ottieni dei %s bridge %s" +msgstr "Ottenere dei %s bridge %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Passo %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Passo 3" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Ora %s aggiungi i bridge a Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sD%sammi i bridge e basta!" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "Opzioni Avanzate" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "No" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "nessuno" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "%sS%sì!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Ora %s aggiungi i bridge a Tor %s" +msgid "%sG%set Bridges" +msgstr "%sO%sttieni Bridge"

1 0

[bridgedb/develop] Update German (de) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 67f2e9588932c1def2e8a09fd0014e077e2d73e8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 19:44:56 2014 +0000 Update German (de) translations. * THANKS to trantor and unknwon_anonymous. --- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 350 ++++++++++++++++++++++---- 1 file changed, 295 insertions(+), 55 deletions(-) diff --git a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po index cf5cbf7..7be5458 100644 --- a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po @@ -1,16 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: +# trantor <clucko3(a)gmail.com>, 2014 +# unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 +# to_ba, 2013 +# to_ba, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-06-06 19:41+0000\n" +"Last-Translator: trantor <clucko3(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,82 +23,318 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "Was sind Bridges?" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "Entschuldigung, etwas lief fehl bei Ihrer Anfrage." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Dies ist eine automatische Nachricht, bitte nicht antworten.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Hier sind Ihre Brücken:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" +"Sie haben den Grenzwert überschritten. Bitte verlangsamen! Der kleinste\n" +"Abstand zwischen den E-Mails beträgt %s Stunden. Alle weiteren E-Mails,\n" +"während dieser Zeit, werden ignoriert." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "Befehle: (Befehle kombinieren, um mehrere Optionen gleichzeitig anzugeben)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "Willkommen bei der Brückendatenbank!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "Aktuell unterstützte Transport TYPEn:" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "Hallo, %s!" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "Hallo Freund!" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Öffentliche Schlüssel" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Diese E-Mail wurde für %s am %s um %s mit Regenbogen, Einhörnern und Glitzer erstellt." -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:42 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridge-Relais %s sind Tor-Relais, die dir dabei helfen, Zensur zu umgehen." +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "Die Brückendatenbank kann Brücken mit verschiedenen %stypen steckbarer Transporte%s bereitstellen, die helfen können Ihre Verbindungen zum Tor Netzwerk zu verschleiern, was es für jeden der ihr Internetverkehr beobachtet, schwierig machen kann festzustellen, daß sie Tor benützen.\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn einige \nsteckbare Transportwege nicht IPv6-kompatibel sind.\n\n" -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Zusätzlich hat die Brückendatenbank viele ganz einfache Vanillabrücken %s ohne jegliche steckbaren Transporte %s, was vielleicht nicht so cool klingt, aber Sie können dennoch dabei helfen in vielen Fällen die Internetzensur zu umgehen.\n" + +#: lib/bridgedb/strings.py:65 +msgid "What are bridges?" +msgstr "Was sind Brücken?" + +#: lib/bridgedb/strings.py:66 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Brücken %s sind Tor-Relais, die Ihnen helfen die Zensur zu umgehen." + +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" -msgstr "Ich brauche einen alternativen Weg, um an Bridges zu kommen!" +msgstr "Ich brauche einen alternativen Weg, um Brücken zu erhalten!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Ein anderer Weg um Öffentliche Bridge-Adressen zu finden, ist es, eine Email (von einer %s oder %s Email-Adresse) mit dem Inhalt 'get bridges', an %s zu schicken." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Eine weitere Möglichkeit, um Brücken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s oder %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" -msgstr "Meine Bridges funktionieren nicht! Ich brauche Hilfe!" +msgstr "Meine Brücken funktionieren nicht! Ich brauche Hilfe!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Sollte Ihr Tor nicht funktionieren, senden Sie bitte eine E-Mail an %s." + +#: lib/bridgedb/strings.py:81 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Wenn dein Tor nicht funktioniert, solltest du eine Email an %s schicken. Schreibe so viele Informationen wie möglich in die Email, wie zb. die Bridges die du benutzt hast, die verwendete Tor-Version, die Fehlermeldung die Tor ausgibt etc." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Versuchen Sie so viele Informationen über ihren Fall wie möglich mit einzubeziehen, einschliesslich einer Liste der Brücken und der steckbaren Transporte die Sie versuchten zu benützen, Ihre Tor Browser Version, und jegliche Meldungen die Tor gegeben hat, usw." + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "Hier sind Ihre Brückenleitungen:" + +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "Brücken erhalten!" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "Bitte die Optionen für den Brückentyp auswählen:" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "Benötigen Sie IPv6-Adressen?" + +#: lib/bridgedb/strings.py:95 +#, python-format +msgid "Do you need a %s?" +msgstr "Benötigen Sie eine %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "Bilder werden in Ihrem Browser nicht ordnungsgemäß dargestellt." + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "Bitte die Zeichen aus dem oberen Bild eingeben." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "So starten Sie die Benutzung Ihrer Brücken" + +#: lib/bridgedb/strings.py:105 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Um die obenstehenden Bridges zu benutzen, gehe in die Netzwerkeinstellungen von Vidalia und klick auf \"Mein ISP blockiert verbindungen zum Tor-Netzwerk\". Dann füge die Bridge-Adressen eine nach der anderen hinzu." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Um Brücken zum Tor-Browser hinzuzufügen, bitte der Anleitung auf der Seite %s, zum Herunterladen des %s Tor-Browsers folgen, um den Tor-Browser zu starten." + +#: lib/bridgedb/strings.py:108 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nbitte auf »Konfigurieren« klicken und dem Assistenten folgen: " + +#: lib/bridgedb/strings.py:111 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blockiert oder zensiert Ihr Internetdienstanbieter die Verbindungen zum Tor-Netzwerk?" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Wählen Sie \"Ja\" und klicken dann \"Weiter\". Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die Zeilen mit den Brücken und fügen Sie sie in das Texteingabefeld ein. Schließlich klicken Sie auf \"Verbinden\" und Sie sollten loslegen können! Falls Sie Schwierigkeiten begegnen, versuchen Sie auf den \"Hilfe\"-Knopf in dem \"Tor Netzwerkeinstellungen\"-Assistenzprogram zu klicken um weitere Hilfe zu erhalten." + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "Diese Nachricht anzeigen." + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "Vanille Brücken anfordern." + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "IPv6-Brücken anfordern." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Einen anschließbaren Transporttypen nach Typ anfordern." + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Einen Fehler melden" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Quellcode" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Derzeit sind keine Bridges vorhanden" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Änderungsprotokoll" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Upgrade deinen Browser zu Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kontakt" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Kopiere die zwei Wörter" +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "Hoppla, Spaghetti!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Schritt 1" +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "Im Moment sind keine Brücken verfügbar …" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:71 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Downloade das %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Möglicherweise sollten Sie versuchen %s zurück zu gehen %s und einen anderen Brückentyp auszuwählen!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Schritt %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Schritt 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "%s Tor Browser %s herunterladen" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Schritt %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Hole %s Bridges %s" +msgstr "%s Brücken %s erhalten" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Schritt %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Schritt 3" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sM%sir nur Brücken geben!" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "Erweiterte Optionen" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "Nein" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "keine" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "%sJ%sa!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Füge nun %s die Bridges zu Tor hinzu %s" +msgid "%sG%set Bridges" +msgstr "%sB%srücken erhalten"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Jun '14

06 Jun '14

commit aff7f4a18930008b52897473385d12b49a35f373 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 6 20:15:03 2014 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index abda83a..541c546 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Simona Trifoi <adrianatrifoi(a)gmail.com>, 2013 +# Adda.17 <adrianatrifoi(a)gmail.com>, 2013 +# laura berindei <lauraagavriloae(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-06 20:10+0000\n" +"Last-Translator: laura berindei <lauraagavriloae(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,11 +36,11 @@ msgstr "" #. "TBB" #: lib/bridgedb/HTTPServer.py:124 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Ne cerem scuze ! Ceva a funcţionat prost !" #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[ Acesta este un mesaj automat ; va rugam nu răspundeţi ]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" @@ -59,7 +60,7 @@ msgstr "" #: lib/bridgedb/strings.py:27 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Bine aţi venit la BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:29 @@ -69,11 +70,11 @@ msgstr "" #: lib/bridgedb/strings.py:30 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Buna , %s!" #: lib/bridgedb/strings.py:31 msgid "Hello, friend!" -msgstr "" +msgstr "Buna , prietene !" #: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 msgid "Public Keys" @@ -143,7 +144,7 @@ msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!" #: lib/bridgedb/strings.py:80 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Daca Tor nu funcţionează trimiteţi un mesaj la %s ." #: lib/bridgedb/strings.py:81 msgid "" @@ -239,7 +240,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "Cod Sursa" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" @@ -247,7 +248,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "Contact" #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!"

1 0

r26818: {website} maybe "you can just" is the reason why some people stop foll (website/trunk/docs/en)
by Roger Dingledine 06 Jun '14

06 Jun '14

Author: arma Date: 2014-06-06 20:03:20 +0000 (Fri, 06 Jun 2014) New Revision: 26818 Modified: website/trunk/docs/en/tor-relay-debian.wml Log: maybe "you can just" is the reason why some people stop following the directions after apt-get install tor. Modified: website/trunk/docs/en/tor-relay-debian.wml =================================================================== --- website/trunk/docs/en/tor-relay-debian.wml 2014-06-06 16:46:45 UTC (rev 26817) +++ website/trunk/docs/en/tor-relay-debian.wml 2014-06-06 20:03:20 UTC (rev 26818) @@ -28,7 +28,7 @@ <h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2> <br> - <p>If you're on Debian, you can just "apt-get install tor".</p> + <p>If you're on Debian, start with "apt-get install tor".</p> <p><b>Do not use the packages in Ubuntu's universe.</b> If you're on Ubuntu or if you want to track newer Tor packages, follow the

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 53637209ae48c43668ef25413dc197fa4d20727d Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 15:15:59 2014 -0400 updated changelog --- CHANGELOG | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a4af818..f274b21 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,20 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ -14.0.0 BETA-1 +f94e27a updated to 14.0.0-RC-1 +bedeb71 more fixes for hidden service configuration now multiple ports are properly configured and notification will display correctl +051cce4 don't allow the tor control port socket to timeout +f4baf4d updated to 2.0.21-stable +120da6b more wizard flow fixes +816a6b2 updating to 1.1.1 +24773c3 update to OpenSSL 1.0.1h +8b5bb04 Makefile patch for Orbot +ccaec1e update 14.0.0-BETA-2 +da3c955 fixes for tor setConf/control port fixes hidden service support manages socks port conflicts +9345186 remove unnecessary line +707bca4 amek sure wizard only is shown once on start (not twice!) +0fddd80 fix for missing libs folder +7abea23 removing binaries from repo +70d7792 updated changelog 2650fda update to 14.0.0-BETA-1 476dc1a update binaries for 0.2.4.22 Tor b6116b5 switch to 0.2.4.22 version of Tor for release

1 0

[orbot/master] more fixes for hidden service configuration
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit bedeb71cf25f25ef5a6c8bbfa2b8fab141f84ca4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 15:05:06 2014 -0400 more fixes for hidden service configuration now multiple ports are properly configured and notification will display correctly --- src/org/torproject/android/Orbot.java | 5 +- src/org/torproject/android/service/TorService.java | 90 +++++++++++++------- 2 files changed, 61 insertions(+), 34 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 7e40c43..81a8575 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -1018,7 +1018,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mService.setProfile(TorServiceConstants.PROFILE_OFF); Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); mHandler.sendMessage(msg); - //trafficRow.setVisibility(RelativeLayout.GONE); } @@ -1037,10 +1036,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic try { - if (mService != null && mService.getStatus() == TorServiceConstants.STATUS_OFF) + if (torStatus == TorServiceConstants.STATUS_OFF) { - - // createProgressDialog(getString(R.string.status_starting_up)); startTor(); } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4640362..3c04d97 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -76,7 +76,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; private static final int ERROR_NOTIFY_ID = 3; - private static final int HS_NOTIFY_ID = 3; + private static final int HS_NOTIFY_ID = 4; private boolean prefPersistNotifications = true; @@ -409,33 +409,61 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); + StringBuffer result = new StringBuffer(); + if (enableHiddenServices) { - File file = new File(appCacheHome, "hostname"); - - if (file.exists()) - { - try { - String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, true); - Editor pEdit = prefs.edit(); - pEdit.putString("pref_hs_hostname",onionHostname); - pEdit.commit(); - - return onionHostname; - - } catch (FileNotFoundException e) { - logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); + String hsPorts = prefs.getString("pref_hs_ports",""); + + StringTokenizer st = new StringTokenizer (hsPorts,","); + String hsPortConfig = null; + + while (st.hasMoreTokens()) + { + + int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]);; + + File fileDir = new File(appCacheHome, "hs" + hsPort); + File file = new File(fileDir, "hostname"); + + + if (file.exists()) + { + try { + String onionHostname = Utils.readString(new FileInputStream(file)).trim(); + + if (result.length() > 0) + result.append(","); + + result.append(onionHostname); + + + } catch (FileNotFoundException e) { + logException("unable to read onion hostname file",e); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); + return null; + } + } + else + { + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); return null; - } - } - else - { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); - - - } + + } + } + + if (result.length() > 0) + { + String onionHostname = result.toString(); + + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, false); + Editor pEdit = prefs.edit(); + pEdit.putString("pref_hs_hostname",onionHostname); + pEdit.commit(); + + return onionHostname; + } + } return null; @@ -623,6 +651,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mHasRoot && mEnableTransparentProxy) enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + getHiddenServiceHostname (); + //checkAddressAndCountry(); } @@ -1876,7 +1906,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("hidden services are enabled"); - //mBinder.updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate String hsPorts = prefs.getString("pref_hs_ports",""); @@ -1896,15 +1925,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst hsPortConfig = hsPortConfig + " 127.0.0.1:" + hsPortConfig; } + hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); + + String hsDirPath = new File(appCacheHome,"hs" + hsPort).getAbsolutePath(); + logMessage("Adding hidden service on port: " + hsPortConfig); - //String hsDirPath = new File(appCacheHome,"hs" + hsPortConfig).getAbsolutePath(); - String hsDirPath = appCacheHome.getAbsolutePath(); - + mBinder.updateConfiguration("HiddenServiceDir",hsDirPath, false); mBinder.updateConfiguration("HiddenServicePort",hsPortConfig, false); - hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); } catch (NumberFormatException e) { Log.e(this.TAG,"error parsing hsport",e);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014