November 2015 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 16 Nov '15

16 Nov '15

commit eac1fb00b1422f923d908bdf6fd20b119a023652 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 23:45:11 2015 +0000 Update translations for whisperback --- pt/pt.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index c782f2a..d5ee3d8 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -4,16 +4,17 @@ # # Translators: # alfalb.as, 2015 -# MMSRS <h_manuela_rodsilva(a)gmail.com>, 2015 -# MMSRS <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-09-14 13:54+0000\n" -"Last-Translator: MMSRS <h_manuela_rodsilva(a)gmail.com>\n" +"PO-Revision-Date: 2015-11-15 23:41+0000\n" +"Last-Translator: Manuela Silva <h_manuela_rodsilva(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,7 +159,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - Envie comentários num email encriptado\nDireitos de Autor (C) 2009-2012 programadores Tails <tails(a)boum.org>\n\nEste programa é software livre, você pode redistribuí-lo e / ou modificá-lo\nsob os termos da GNU General Public License conforme publicada pela\nFree Software Foundation; tanto a versão 3 da licença, ou (a seu critério)\nqualquer versão posterior.\n\nEste programa é distribuído na esperança que será útil, mas\nSEM QUALQUER GARANTIA, sem mesmo a garantia implícita de \nCOMERCIALIZAÇÃO ou ADEQUAÇÃO A UM DETERMINADO FIM. Veja a\nLicença Pública Geral GNU para mais detalhes.\n\nDeverá ter recebido uma cópia da Licença Pública Geral GNU\njunto com este programa. Caso contrário, consulte <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - Envie comentários numa mensagem encriptada\nDireitos de Autor (C) 2009-2012 programadores do Tails <tails(a)boum.org>\n\nEste programa é um software livre, pode redistribuí-lo e/ou modificá-lo\nsob os termos da GNU - Licença Pública Geral, conforme publicada pela\nFundação de Software Livre; tanto a versão 3 da licença, ou (a seu critério)\nqualquer versão posterior.\n\nEste programa é distribuído na esperança que este será útil, mas\nSEM QUALQUER GARANTIA, sem mesmo a garantia implícita de \nCOMERCIALIZAÇÃO ou ADEQUAÇÃO A UM DETERMINADO FIM. Consulte a GNU - Licença Pública Geral para mais detalhes.\n\nDeverá ter recebido uma cópia da GNU - Licença Pública Geral \ncom este programa. Se não, consulte <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[onionoo/master] Support searches by space-separated fingerprint.
by karsten＠torproject.org 15 Nov '15

15 Nov '15

commit 56e0e019edd0721bf725fd7699a316a3c90ffd16 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Oct 10 12:38:57 2015 +0200 Support searches by space-separated fingerprint. Includes suggestions by iwakeh, including using String[] instead of HashSet<String> for lower memory requirements. Implements #17115. --- build.xml | 2 +- .../torproject/onionoo/docs/SummaryDocument.java | 16 +++++++++ .../torproject/onionoo/server/RequestHandler.java | 10 ++++++ .../torproject/onionoo/server/ResponseBuilder.java | 4 +-- .../onionoo/docs/SummaryDocumentTest.java | 38 ++++++++++++++++++++ .../onionoo/server/ResourceServletTest.java | 20 +++++++++++ web/protocol.html | 19 +++++----- 7 files changed, 96 insertions(+), 13 deletions(-) diff --git a/build.xml b/build.xml index 03a97f1..de5d84a 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ <project default="dist" name="onionoo" basedir="."> - <property name="onionoo.protocol.version" value="2.6"/> + <property name="onionoo.protocol.version" value="3.0"/> <property name="release.version" value="${onionoo.protocol.version}.0"/> <property name="javasources" value="src/main/java"/> diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index ae7202b..0c217c1 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -68,6 +68,22 @@ public class SummaryDocument extends Document { return this.base64Fingerprint; } + private transient String[] fingerprintSortedHexBlocks = null; + public String[] getFingerprintSortedHexBlocks() { + if (this.fingerprintSortedHexBlocks == null && this.f != null) { + String fingerprint = this.f.toUpperCase(); + String[] fingerprintSortedHexBlocks = + new String[fingerprint.length() / 4]; + for (int i = 0; i < fingerprint.length(); i += 4) { + fingerprintSortedHexBlocks[i / 4] = fingerprint.substring( + i, Math.min(i + 4, fingerprint.length())); + } + Arrays.sort(fingerprintSortedHexBlocks); + this.fingerprintSortedHexBlocks = fingerprintSortedHexBlocks; + } + return this.fingerprintSortedHexBlocks; + } + private String n; public void setNickname(String nickname) { if (nickname == null || nickname.equals("Unnamed")) { diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 2d8dd58..bd75992 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -3,6 +3,7 @@ package org.torproject.onionoo.server; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -209,6 +210,8 @@ public class RequestHandler { SummaryDocument entry = e.getValue(); String base64Fingerprint = entry.isRelay() ? entry.getBase64Fingerprint() : null; + String[] fingerprintSortedHexBlocks = + entry.getFingerprintSortedHexBlocks(); boolean lineMatches = false; String nickname = entry.getNickname() != null ? entry.getNickname().toLowerCase() : "unnamed"; @@ -229,6 +232,13 @@ public class RequestHandler { base64Fingerprint.startsWith(searchTerm)) { /* Base64-encoded fingerprint matches. */ lineMatches = true; + } else if (searchTerm.length() == 4 && + fingerprintSortedHexBlocks != null && + Arrays.binarySearch(fingerprintSortedHexBlocks, + searchTerm.toUpperCase()) >= 0) { + /* 4-hex-character block of space-separated fingerprint + * matches. */ + lineMatches = true; } else { List<String> addresses = entry.getAddresses(); for (String address : addresses) { diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index e7c614a..4afa782 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -70,9 +70,9 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "2.6"; + private static final String PROTOCOL_VERSION = "3.0"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2015-11-15"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { String nextMajorVersionScheduledLine = diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java new file mode 100644 index 0000000..f25528c --- /dev/null +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -0,0 +1,38 @@ +/* Copyright 2015 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.onionoo.docs; + +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.TreeSet; + +import org.junit.Test; + +public class SummaryDocumentTest { + + @Test() + public void testFingerprintSortedHexBlocksAreSorted() { + SummaryDocument relayTorkaZ = new SummaryDocument(true, "TorkaZ", + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( + new String[] { "62.216.201.221", "62.216.201.222", + "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<String>(Arrays.asList(new String[] { "Running", + "Valid" })), 20L, "de", + DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", + "torkaz <klaus dot zufall at gmx dot de> " + + "<fb-token:np5_g_83jmf=>", new TreeSet<String>(Arrays.asList( + new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + new TreeSet<String>(Arrays.asList( + new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" }))); + String[] fingerprintSortedHexBlocks = + relayTorkaZ.getFingerprintSortedHexBlocks(); + for (int i = 0; i < fingerprintSortedHexBlocks.length - 1; i++) { + assertTrue("Hex blocks not in sorted order", + fingerprintSortedHexBlocks[i].compareTo( + fingerprintSortedHexBlocks[i + 1]) <= 0); + } + } +} + diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index f52413a..8370b16 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -611,6 +611,26 @@ public class ResourceServletTest { } @Test() + public void testSearchSpaceSeparatedFingerprintFourty() { + this.assertSummaryDocument( + "/summary?search=000C 5F55 BD48 14B9 17CC 474B D537 F1A3 B33C " + + "CE2A", 1, new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchSpaceSeparatedFingerprintLastEight() { + this.assertSummaryDocument( + "/summary?search=F1A3 B33C", 1, new String[] { "TorkaZ" }, 0, + null); + } + + @Test() + public void testSearchSpaceSeparatedFingerprintLastThree() { + this.assertSummaryDocument( + "/summary?search=33C", 0, null, 0, null); + } + + @Test() public void testSearchIp() { this.assertSummaryDocument( "/summary?search=62.216.201.221", 1, new String[] { "TorkaZ" }, 0, diff --git a/web/protocol.html b/web/protocol.html index 1ca14d1..e18afea 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -183,9 +183,8 @@ documents on August 13, 2015.</li> <li>2.6: Added optional "alleged_family" and "indirect_family" fields and deprecated optional "family" field in details documents on August 25, 2015.</li> -<li>3.0 (scheduled, but not deployed yet!): Extend search -parameter to match any 4 hex characters of a space-separated fingerprint, -to be deployed by November 15, 2015.</li> +<li>3.0: Extended search parameter to match any 4 hex +characters of a space-separated fingerprint on November 15, 2015.</li> </ul> </div>  @@ -289,13 +288,13 @@ Parameter values are case-insensitive. <li> search -Return only (1) relays with the parameter value -matching (part of a) nickname, (possibly $-prefixed) beginning of a -hex-encoded fingerprint, beginning of a base64-encoded fingerprint -without trailing equal signs, or beginning of an IP address, (2) bridges -with (part of a) nickname or (possibly $-prefixed) beginning of a hashed -hex-encoded fingerprint, and (3) relays and/or bridges matching a given -qualified search term. +Return only (1) relays with the parameter value matching (part of a) +nickname, (possibly $-prefixed) beginning of a hex-encoded fingerprint, +any 4 hex characters of a space-separated fingerprint, beginning of a +base64-encoded fingerprint without trailing equal signs, or beginning of +an IP address, (2) bridges with (part of a) nickname or (possibly +$-prefixed) beginning of a hashed hex-encoded fingerprint, and (3) relays +and/or bridges matching a given qualified search term. Searches by relay IP address include all known addresses used for onion routing and for exiting to the Internet. Searches for beginnings of IP addresses are performed on textual

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit f6a6fe36b6db6a2ec41d2de0e55a50d344e26709 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 14:15:08 2015 +0000 Update translations for bridgedb_completed --- it/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index 61d0174..57171ea 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Alberto <alberto.pilato(a)gmail.com>, 2015 # fetidyoo <tru74368(a)yahoo.com>, 2011 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # HostFat <hostfat(a)gmail.com>, 2015 @@ -11,7 +12,7 @@ # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Luca Marzo <luca(a)jeckodevelopment.it>, 2011 # Matteo Anese <anese.matteo(a)gmail.com>, 2015 -# n0on3 <a.n0on3(a)gmail.com>, 2011 +# Alessandro Manfredi <a.n0on3(a)gmail.com>, 2011 # Paolo Stivanin <paolostivanin(a)gmail.com>, 2014 # Random_R, 2013 # Random_R, 2013-2015 @@ -19,14 +20,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-08-11 11:04+0000\n" -"Last-Translator: Matteo Anese <anese.matteo(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-11-15 13:58+0000\n" +"Last-Translator: Alberto <alberto.pilato(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -41,57 +43,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Segnala un Errore" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Codice Sorgente" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Changelog" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contatti" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Seleziona tutto" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Mostra Codice QR" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "Codice QR per le tue bridge lines" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Non ci sono bridge disponibili al momento..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +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!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Passo %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Scarica %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Passo %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Ottenere dei %s bridge %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Passo %s3%s" + +#: bridgedb/https/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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sD%sammi i bridge e basta!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Opzioni Avanzate" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +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." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sO%sttieni Bridge" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Questo è un messaggio inviato automaticamente, si prega di non rispondere.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Ecco i tuoi bridge:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, 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 di email. Per favore rallenta! Il tempo minimo tra le email è di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Benvenuto/a su BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Transport TYPEs attualmente supportati:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hey, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Ciao amico!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 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:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -102,7 +229,7 @@ msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -113,7 +240,7 @@ msgid "" 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" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -125,7 +252,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -134,20 +261,20 @@ 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:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Cosa sono i bridge?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, 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:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Mi serve un altro modo per avere dei bridge!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -155,12 +282,12 @@ msgid "" "%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:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "I miei bridge non funzionano! Mi serve aiuto!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Se Tor non ti funziona, manda un'email a %s." @@ -168,48 +295,48 @@ msgstr "Se Tor non ti funziona, manda un'email a %s." #. 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 +#: bridgedb/strings.py:121 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:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Ecco le tue linee bridge:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Ottieni dei Bridge!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Seleziona le opzioni per il tipo di bridge:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Ti servono indirizzi IPv6?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Ti serve un %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Il tuo browser non mostra le immagini in modo corretto." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Inserisci i caratteri nell'immagine sopra..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Come iniziare a usare i tuoi bridge" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -218,21 +345,21 @@ msgid "" msgstr "Per inserire i bridge in Tor Browser, prima vai nella %s pagina di download di\nTor Browser %s e poi segui lì le istruzioni per scaricare ed avviare Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 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:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 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?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -240,153 +367,28 @@ 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:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mostra questo messaggio." #. 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Richiedi bridge vanilla." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Richiedi bridge IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "Richiedi un Pluggable Transport by TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 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:89 -msgid "Report a Bug" -msgstr "Segnala un Errore" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Codice Sorgente" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Changelog" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contatti" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Seleziona tutto" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Mostra QRCode" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QRCode per le tue linee ponte" - -#. 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:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode." - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "Non ci sono bridge disponibili al momento..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -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 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Scarica %s Tor Browser %s" - -#: 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 "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: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.) -#: 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:52 -msgid "Advanced Options" -msgstr "Opzioni Avanzate" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: 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:127 -#, python-format -msgid "%sY%ses!" -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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sO%sttieni Bridge"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit bdfdf77b0ddb5f5483e257fa80a8f13b2b1b08d5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 14:15:03 2015 +0000 Update translations for bridgedb --- it/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index 61d0174..57171ea 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Alberto <alberto.pilato(a)gmail.com>, 2015 # fetidyoo <tru74368(a)yahoo.com>, 2011 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # HostFat <hostfat(a)gmail.com>, 2015 @@ -11,7 +12,7 @@ # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Luca Marzo <luca(a)jeckodevelopment.it>, 2011 # Matteo Anese <anese.matteo(a)gmail.com>, 2015 -# n0on3 <a.n0on3(a)gmail.com>, 2011 +# Alessandro Manfredi <a.n0on3(a)gmail.com>, 2011 # Paolo Stivanin <paolostivanin(a)gmail.com>, 2014 # Random_R, 2013 # Random_R, 2013-2015 @@ -19,14 +20,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-08-11 11:04+0000\n" -"Last-Translator: Matteo Anese <anese.matteo(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-11-15 13:58+0000\n" +"Last-Translator: Alberto <alberto.pilato(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -41,57 +43,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Segnala un Errore" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Codice Sorgente" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Changelog" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contatti" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Seleziona tutto" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Mostra Codice QR" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "Codice QR per le tue bridge lines" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Non ci sono bridge disponibili al momento..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +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!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Passo %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Scarica %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Passo %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Ottenere dei %s bridge %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Passo %s3%s" + +#: bridgedb/https/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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sD%sammi i bridge e basta!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Opzioni Avanzate" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +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." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sO%sttieni Bridge" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Questo è un messaggio inviato automaticamente, si prega di non rispondere.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Ecco i tuoi bridge:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, 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 di email. Per favore rallenta! Il tempo minimo tra le email è di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Benvenuto/a su BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Transport TYPEs attualmente supportati:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hey, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Ciao amico!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 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:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -102,7 +229,7 @@ msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -113,7 +240,7 @@ msgid "" 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" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -125,7 +252,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -134,20 +261,20 @@ 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:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Cosa sono i bridge?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, 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:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Mi serve un altro modo per avere dei bridge!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -155,12 +282,12 @@ msgid "" "%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:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "I miei bridge non funzionano! Mi serve aiuto!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Se Tor non ti funziona, manda un'email a %s." @@ -168,48 +295,48 @@ msgstr "Se Tor non ti funziona, manda un'email a %s." #. 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 +#: bridgedb/strings.py:121 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:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Ecco le tue linee bridge:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Ottieni dei Bridge!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Seleziona le opzioni per il tipo di bridge:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Ti servono indirizzi IPv6?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Ti serve un %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Il tuo browser non mostra le immagini in modo corretto." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Inserisci i caratteri nell'immagine sopra..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Come iniziare a usare i tuoi bridge" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -218,21 +345,21 @@ msgid "" msgstr "Per inserire i bridge in Tor Browser, prima vai nella %s pagina di download di\nTor Browser %s e poi segui lì le istruzioni per scaricare ed avviare Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 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:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 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?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -240,153 +367,28 @@ 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:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mostra questo messaggio." #. 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Richiedi bridge vanilla." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Richiedi bridge IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "Richiedi un Pluggable Transport by TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 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:89 -msgid "Report a Bug" -msgstr "Segnala un Errore" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Codice Sorgente" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Changelog" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contatti" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Seleziona tutto" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Mostra QRCode" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QRCode per le tue linee ponte" - -#. 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:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode." - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "Non ci sono bridge disponibili al momento..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -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 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Scarica %s Tor Browser %s" - -#: 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 "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: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.) -#: 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:52 -msgid "Advanced Options" -msgstr "Opzioni Avanzate" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: 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:127 -#, python-format -msgid "%sY%ses!" -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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sO%sttieni Bridge"

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit e1d661e55408f39098b96b51a2e68f7dbb7d2410 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:17:19 2015 +0000 Update translations for tor-messenger-privproperties_completed --- ja/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ja/priv.properties b/ja/priv.properties new file mode 100644 index 0000000..c763c1e --- /dev/null +++ b/ja/priv.properties @@ -0,0 +1 @@ +priv.account=%S用のプライベートキーを生成中 (%S) ...

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit 4e7f67aeabe6edbe7773bdc16a306d2577a06660 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:17:07 2015 +0000 Update translations for tor-messenger-ircproperties --- ja/irc.properties | 2 +- ko/irc.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/irc.properties b/ja/irc.properties index 80df689..b6a1439 100644 --- a/ja/irc.properties +++ b/ja/irc.properties @@ -26,7 +26,7 @@ joinChat.password=_Password # These are the protocol specific options shown in the account manager and # account wizard windows. options.server=Server -options.port=Port +options.port=ポート options.ssl=Use SSL options.encoding=Character Set options.quitMessage=Quit message diff --git a/ko/irc.properties b/ko/irc.properties index 3e4725b..e7b8eba 100644 --- a/ko/irc.properties +++ b/ko/irc.properties @@ -201,5 +201,5 @@ tooltip.serverValue=%1$S (%2$S) # LOCALIZATION NOTE (yes, no): # These are used to turn true/false values into a yes/no response. -yes=Yes -no=No +yes=예 +no=아니오

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit a51f005747618560497bd98a401675ae2c003a22 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:16:59 2015 +0000 Update translations for tor-messenger-fingerdtd --- ko/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/finger.dtd b/ko/finger.dtd index de85962..26788f4 100644 --- a/ko/finger.dtd +++ b/ko/finger.dtd @@ -1,4 +1,4 @@ -<!ENTITY finger.title "알고 있는 지문들:"> +<!ENTITY finger.title "알려진 인증 번호들:"> <!ENTITY finger.screenName "Screenname"> <!ENTITY finger.status "Status"> <!ENTITY finger.verified "Verified">

1 0

[tor-commits] [translation/tor-messenger-facebookproperties_completed] Update translations for tor-messenger-facebookproperties_completed
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit af9a44fdb2dd8beb74d8716e61f5c431b8f99684 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:16:55 2015 +0000 Update translations for tor-messenger-facebookproperties_completed --- ja/facebook.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ja/facebook.properties b/ja/facebook.properties new file mode 100644 index 0000000..d9a263a --- /dev/null +++ b/ja/facebook.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +connection.error.useUsernameNotEmailAddress=Facebookユーザー名を使用してください、Emailアドレスは無効です。 + +facebook.chat.name=Facebookチャット

1 0

[translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit 211231241868d495d83fb0818593909a0951944a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:16:51 2015 +0000 Update translations for tor-messenger-facebookproperties --- ja/facebook.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/facebook.properties b/ja/facebook.properties index aaf7cdc..d9a263a 100644 --- a/ja/facebook.properties +++ b/ja/facebook.properties @@ -2,6 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -connection.error.useUsernameNotEmailAddress=Please use your Facebook username, not an email address +connection.error.useUsernameNotEmailAddress=Facebookユーザー名を使用してください、Emailアドレスは無効です。 -facebook.chat.name=Facebook Chat +facebook.chat.name=Facebookチャット

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 15 Nov '15

15 Nov '15

commit 9831739ee20407e3a3a2140f3774122dee9d68b6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 15 13:16:37 2015 +0000 Update translations for tor-messenger-authdtd --- ko/auth.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/auth.dtd b/ko/auth.dtd index 6857170..e2c25c7 100644 --- a/ko/auth.dtd +++ b/ko/auth.dtd @@ -1,9 +1,9 @@ <!ENTITY authDialog.title "Verify contact's identity"> <!ENTITY authDialog.authenticate "검증"> -<!ENTITY authDialog.cancel "Cancel"> -<!ENTITY authDialog.help "Help"> -<!ENTITY authDialog.yes "Yes"> -<!ENTITY authDialog.no "No"> +<!ENTITY authDialog.cancel "취소"> +<!ENTITY authDialog.help "도움말"> +<!ENTITY authDialog.yes "예"> +<!ENTITY authDialog.no "아니오"> <!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> <!ENTITY authDialog.yourFingerprint "Your fingerprint"> <!ENTITY authDialog.theirFingerprint "Their purported fingerprint">

1 0