August 2014 - tor-commits - lists.torproject.org

[stem/master] Stylistic issues from pep8 1.5.7
by atagar＠torproject.org 17 Aug '14

17 Aug '14

1 0

[stem/master] Optimze _read_until_keywords a little
by atagar＠torproject.org 16 Aug '14

16 Aug '14

commit 964eea9fb1ecb282cfbabafc29da45f88ed6ee3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 13 20:46:30 2014 -0400 Optimze _read_until_keywords a little - use an unconditional function call in the inner loop rather than checking whether content is set all the time. This saves a few percent. - use a compiled regex to determine whether we have found the target keywords. This is a fairly big win fwict. Perhaps this regex can be tuned further? --- stem/descriptor/__init__.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 9fe7235..411ad3d 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -419,7 +419,12 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi **True** """ - content = None if skip else [] + if skip: + content = None + content_append = lambda x: None + else: + content = [] + content_append = content.append ending_keyword = None if isinstance(keywords, (bytes, unicode)): @@ -428,8 +433,10 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if ignore_first: first_line = descriptor_file.readline() - if content is not None and first_line is not None: - content.append(first_line) + if first_line is not None: + content_append(first_line) + + match_re = re.compile(r'^(%s)(?:[ \t].*|)$' % "|".join(keywords)) while True: last_position = descriptor_file.tell() @@ -442,25 +449,19 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if not line: break # EOF - line_match = KEYWORD_LINE.match(stem.util.str_tools._to_unicode(line)) + line_match = match_re.match(stem.util.str_tools._to_unicode(line)) - if not line_match: - # no spaces or tabs in the line - line_keyword = stem.util.str_tools._to_unicode(line.strip()) - else: - line_keyword = line_match.groups()[0] - - if line_keyword in keywords: - ending_keyword = line_keyword + if line_match: + ending_keyword = line_match.groups()[0] if not inclusive: descriptor_file.seek(last_position) - elif content is not None: - content.append(line) + else: + content_append(line) break - elif content is not None: - content.append(line) + else: + content_append(line) if include_ending_keyword: return (content, ending_keyword)

1 0

[stem/master] Improve parsing speed for consensus documents
by atagar＠torproject.org 16 Aug '14

16 Aug '14

commit 2a7555ee6f0c598a598eaa2a52b2d19eaf5715a9 Merge: 1486167 b427ad8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 16 15:43:59 2014 -0700 Improve parsing speed for consensus documents Improvements from Nick so we can parse consensus documents faster (and to a lesser extent other document types). This reduces the parse type by around 30% according to cProfile. https://trac.torproject.org/12859 docs/change_log.rst | 4 ++++ stem/descriptor/__init__.py | 35 +++++++++++++++++--------------- stem/descriptor/router_status_entry.py | 16 +-------------- 3 files changed, 24 insertions(+), 31 deletions(-)

1 0

[stem/master] Using a constant for line regex we match against
by atagar＠torproject.org 16 Aug '14

16 Aug '14

commit b427ad8fbea4adbe4ba92324e80425981e54fbdb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 16 15:37:14 2014 -0700 Using a constant for line regex we match against Just a minor tweak so the regex we use is with the others for descriptor content. --- docs/change_log.rst | 4 ++++ stem/descriptor/__init__.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6789212..b52a377 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,6 +40,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Descriptors** + + * Improved speed for parsing consensus documents by around 30% (:trac:`12859`) + * **Utilities** * Added support for directories to :func:`stem.util.conf.Config.load`. diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 411ad3d..c14d984 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -68,6 +68,7 @@ except ImportError: KEYWORD_CHAR = 'a-zA-Z0-9-' WHITESPACE = ' \t' KEYWORD_LINE = re.compile('^([%s]+)(?:[%s]+(.*))?$' % (KEYWORD_CHAR, WHITESPACE)) +SPECIFIC_KEYWORD_LINE = '^(%%s)(?:[%s]+(.*))?$' % WHITESPACE PGP_BLOCK_START = re.compile('^-----BEGIN ([%s%s]+)-----$' % (KEYWORD_CHAR, WHITESPACE)) PGP_BLOCK_END = '-----END %s-----' @@ -425,6 +426,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi else: content = [] content_append = content.append + ending_keyword = None if isinstance(keywords, (bytes, unicode)): @@ -436,7 +438,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if first_line is not None: content_append(first_line) - match_re = re.compile(r'^(%s)(?:[ \t].*|)$' % "|".join(keywords)) + keyword_match = re.compile(SPECIFIC_KEYWORD_LINE % '|'.join(keywords)) while True: last_position = descriptor_file.tell() @@ -449,7 +451,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if not line: break # EOF - line_match = match_re.match(stem.util.str_tools._to_unicode(line)) + line_match = keyword_match.match(stem.util.str_tools._to_unicode(line)) if line_match: ending_keyword = line_match.groups()[0]

1 0

[stem/master] Use binascii.b2a_hex instead of hand-tweaked string concatenation
by atagar＠torproject.org 16 Aug '14

16 Aug '14

commit fa5bd4c0522afa46156f05858d8fccd6b6d87dfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 13 20:44:14 2014 -0400 Use binascii.b2a_hex instead of hand-tweaked string concatenation This is a major performance win for parsing. --- stem/descriptor/router_status_entry.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index c1003d7..ee18705 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -715,8 +715,6 @@ def _base64_to_hex(identity, validate, check_if_fingerprint = True): missing_padding = len(identity) % 4 identity += '=' * missing_padding - fingerprint = '' - try: identity_decoded = base64.b64decode(stem.util.str_tools._to_bytes(identity)) except (TypeError, binascii.Error): @@ -725,19 +723,7 @@ def _base64_to_hex(identity, validate, check_if_fingerprint = True): raise ValueError("Unable to decode identity string '%s'" % identity) - for char in identity_decoded: - # Individual characters are either standard ASCII or hex encoded, and each - # represent two hex digits. For instance... - # - # >>> ord('\n') - # 10 - # >>> hex(10) - # '0xa' - # >>> '0xa'[2:].zfill(2).upper() - # '0A' - - char_int = char if isinstance(char, int) else ord(char) - fingerprint += hex(char_int)[2:].zfill(2).upper() + fingerprint = binascii.b2a_hex(identity_decoded).upper() if check_if_fingerprint: if not stem.util.tor_tools.is_valid_fingerprint(fingerprint):

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 16 Aug '14

16 Aug '14

commit 3f5f6353f94b3cfd626c2439f34a410e71821fbc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 16 20:15:31 2014 +0000 Update translations for tor-launcher-properties_completed --- it/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index 731ced4..06dd4f5 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Avviatore di Tor -torlauncher.tor_exited=Tor si è arrestato inaspettatamente. -torlauncher.tor_connection_lost=La tua connesione alla rete Tor è stata persa. +torlauncher.tor_exited=Tor si è chiuso inaspettatamente. La causa può essere un bug dello stesso Tor, un altro programma sul tuo sistema o hardware difettoso. Finchè non riavvii Tor, il Tor Browser non potrà connettersi. Se il problema persiste, invia una copia del log di Tor al team di supporto. +torlauncher.tor_exited2=Il riavvio di Tor non chiuderà le schede del browser. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il torlauncher.recommended_bridge=(raccomandato) torlauncher.connect=Connetti -torlauncher.reconnect=Riconnettiti +torlauncher.restart_tor=Riavvia Tor torlauncher.quit=Esci torlauncher.quit_win=Esci torlauncher.done=Fatto

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Aug '14

16 Aug '14

commit 2d42bf1e7d1eb55ff7c2de9ab8f53020787bfdc2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 16 20:15:29 2014 +0000 Update translations for tor-launcher-properties --- it/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index a779194..06dd4f5 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è chiuso inaspettatamente. La causa può essere un bug dello stesso Tor, un altro programma sul tuo sistema o hardware difettoso. Finchè non riavvii Tor, il Tor Browser non potrà connettersi. Se il problema persiste, invia una copia del log di Tor al team di supporto. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Il riavvio di Tor non chiuderà le schede del browser. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Aug '14

16 Aug '14

commit 58103553ea3906361db036f3e12e7652698e9841 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 16 19:45:40 2014 +0000 Update translations for tor-launcher-properties --- it/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index 2fafe6c..a779194 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Avviatore di Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Tor si è chiuso inaspettatamente. La causa può essere un bug dello stesso Tor, un altro programma sul tuo sistema o hardware difettoso. Finchè non riavvii Tor, il Tor Browser non potrà connettersi. Se il problema persiste, invia una copia del log di Tor al team di supporto. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 16 Aug '14

16 Aug '14

commit e1b37ce7a2e65e2a3b75b43fc06ed519871a4315 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 16 19:45:10 2014 +0000 Update translations for bridgedb_completed --- it/LC_MESSAGES/bridgedb.po | 138 ++++++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 57 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index ba7d480..400ac48 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -18,9 +18,9 @@ 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-20 15:51+0000\n" -"Last-Translator: Paolo Stivanin <paolostivanin(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-08-16 19:40+0000\n" +"Last-Translator: Random_R\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" @@ -31,19 +31,16 @@ msgstr "" #. 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" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta." @@ -67,39 +64,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Benvenuto/a su BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "Transport TYPEs attualmente supportati:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Hey, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Ciao amico!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 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 +#: lib/bridgedb/strings.py:37 #, 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 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -109,14 +111,20 @@ msgid "" "\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 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 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 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -125,96 +133,104 @@ msgid "" "\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 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Cosa sono i bridge?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format 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/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Mi serve un altro modo per avere dei bridge!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "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." +"%s, %s or %s." +msgstr "Un altro modo di ottenere i bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s." -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "I miei bridge non funzionano! Mi serve aiuto!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, 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 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 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 "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 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Ecco le tue linee bridge:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Ottieni dei Bridge!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Seleziona le opzioni per il tipo di bridge:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Ti servono indirizzi IPv6?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Ti serve un %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Il tuo browser non mostra le immagini in modo corretto." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Inserisci i caratteri nell'immagine sopra..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Come iniziare a usare i tuoi bridge" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, 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 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 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 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "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 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 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" @@ -222,52 +238,61 @@ msgid "" "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 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Mostra questo messaggio." -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "Richiedi bridge vanilla." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Richiedi bridge IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Richiedi un Pluggable Transport by TYPE." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 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 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "Segnala un Errore" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "Codice Sorgente" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Changelog" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "Contatti" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "Non ci sono bridge disponibili al momento..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -308,28 +333,27 @@ msgstr "Ora %s aggiungi i bridge a Tor Browser %s" #. 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 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sD%sammi i bridge e basta!" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Opzioni Avanzate" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "No" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 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 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "%sS%sì!" @@ -337,7 +361,7 @@ msgstr "%sS%sì!" #. 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 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sttieni Bridge"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Aug '14

16 Aug '14

commit e59b5f14477ab1d37189d91a2e74a316d4420361 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 16 19:45:03 2014 +0000 Update translations for bridgedb --- it/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index c1da40b..400ac48 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -19,8 +19,8 @@ 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-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-08-16 19:40+0000\n" +"Last-Translator: Random_R\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" @@ -152,7 +152,7 @@ msgid "" "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, %s or %s." -msgstr "" +msgstr "Un altro modo di ottenere i bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!"

1 0