July 2016 - tor-commits - lists.torproject.org

[exonerator/master] Checkstyle doesn't complain anymore.
by karsten＠torproject.org 12 Jul '16

12 Jul '16

commit 1f7bd3f0acc18fb76914b5aa0800e0980fbf946b Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jul 12 18:31:26 2016 +0200 Checkstyle doesn't complain anymore. --- .../exonerator/ExoneraTorDatabaseImporter.java | 4 +- .../torproject/exonerator/ExoneraTorServlet.java | 144 +++++++++++---------- 2 files changed, 76 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java index 23c009b..3777908 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java @@ -38,7 +38,7 @@ import java.util.TimeZone; /* Import Tor descriptors into the ExoneraTor database. */ public class ExoneraTorDatabaseImporter { - /* Main function controlling the parsing process. */ + /** Main function controlling the parsing process. */ public static void main(String[] args) { readConfiguration(); openDatabaseConnection(); @@ -154,7 +154,7 @@ public class ExoneraTorDatabaseImporter { DescriptorSourceFactory.createDescriptorCollector(); collector.collectDescriptors("https://collector.torproject.org", new String[] { "/recent/relay-descriptors/consensuses/", - "/recent/exit-lists/" }, 0L, new File(importDirString), true); + "/recent/exit-lists/" }, 0L, new File(importDirString), true); } /* Last and next parse histories containing paths of parsed files and diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index f637150..df31a0c 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -44,6 +44,7 @@ public class ExoneraTorServlet extends HttpServlet { private Logger logger; + @Override public void init() { /* Initialize logger. */ @@ -59,6 +60,7 @@ public class ExoneraTorServlet extends HttpServlet { } } + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -99,8 +101,8 @@ public class ExoneraTorServlet extends HttpServlet { /* Parse parameters. */ String ipParameter = request.getParameter("ip"); - String relayIP = this.parseIpParameter(ipParameter); - boolean relayIPHasError = relayIP == null; + String relayIp = this.parseIpParameter(ipParameter); + boolean relayIpHasError = relayIp == null; /* Parse timestamp parameter. */ String timestampParameter = request.getParameter("timestamp"); @@ -124,16 +126,16 @@ public class ExoneraTorServlet extends HttpServlet { } /* Write form. */ - this.writeForm(out, rb, relayIP, relayIPHasError - || ("".equals(relayIP) && !"".equals(timestampStr)), timestampStr, - !relayIPHasError - && !("".equals(relayIP) && !"".equals(timestampStr)) + this.writeForm(out, rb, relayIp, relayIpHasError + || ("".equals(relayIp) && !"".equals(timestampStr)), timestampStr, + !relayIpHasError + && !("".equals(relayIp) && !"".equals(timestampStr)) && (timestampHasError || timestampOutOfRange - || (!"".equals(relayIP) && "".equals(timestampStr)))); + || (!"".equals(relayIp) && "".equals(timestampStr)))); /* If both parameters are empty, don't print any summary and exit. * This is the start page. */ - if ("".equals(relayIP) && "".equals(timestampStr)) { + if ("".equals(relayIp) && "".equals(timestampStr)) { this.writeFooter(out, rb); this.closeDatabaseConnection(conn, requestedConnection); return; @@ -141,8 +143,8 @@ public class ExoneraTorServlet extends HttpServlet { /* If either parameter is empty, print summary with warning message * and exit. */ - if ("".equals(relayIP) || "".equals(timestampStr)) { - if ("".equals(relayIP)) { + if ("".equals(relayIp) || "".equals(timestampStr)) { + if ("".equals(relayIp)) { writeSummaryNoIp(out, rb); } else { writeSummaryNoTimestamp(out, rb); @@ -154,8 +156,8 @@ public class ExoneraTorServlet extends HttpServlet { /* If there's a user error, print summary with exit message and * exit. */ - if (relayIPHasError || timestampHasError || timestampOutOfRange) { - if (relayIPHasError) { + if (relayIpHasError || timestampHasError || timestampOutOfRange) { + if (relayIpHasError) { this.writeSummaryInvalidIp(out, rb, ipParameter); } else if (timestampHasError) { this.writeSummaryInvalidTimestamp(out, rb, timestampParameter); @@ -190,7 +192,7 @@ public class ExoneraTorServlet extends HttpServlet { /* Search for status entries with the given IP address as onion * routing address, plus status entries of relays having an exit list * entry with the given IP address as exit address. */ - List<String[]> statusEntries = this.queryStatusEntries(conn, relayIP, + List<String[]> statusEntries = this.queryStatusEntries(conn, relayIp, timestamp, validAfterTimeFormat); /* If we didn't find anything, run another query to find out if there @@ -199,14 +201,14 @@ public class ExoneraTorServlet extends HttpServlet { List<String> addressesInSameNetwork = null; if (statusEntries.isEmpty()) { addressesInSameNetwork = new ArrayList<String>(); - if (!relayIP.contains(":")) { - String address24 = this.convertIPv4ToHex(relayIP).substring(0, 6); + if (!relayIp.contains(":")) { + String address24 = this.convertIpV4ToHex(relayIp).substring(0, 6); if (address24 != null) { addressesInSameNetwork = this.queryAddressesInSame24(conn, address24, timestamp); } } else { - String address48 = this.convertIPv6ToHex(relayIP).substring( + String address48 = this.convertIpV6ToHex(relayIp).substring( 0, 12); if (address48 != null) { addressesInSameNetwork = this.queryAddressesInSame48(conn, @@ -217,18 +219,18 @@ public class ExoneraTorServlet extends HttpServlet { /* Print out result. */ if (!statusEntries.isEmpty()) { - this.writeSummaryPositive(out, rb, relayIP, timestampStr); - this.writeTechnicalDetails(out, rb, relayIP, timestampStr, + this.writeSummaryPositive(out, rb, relayIp, timestampStr); + this.writeTechnicalDetails(out, rb, relayIp, timestampStr, statusEntries); } else if (addressesInSameNetwork != null && !addressesInSameNetwork.isEmpty()) { - this.writeSummaryAddressesInSameNetwork(out, rb, relayIP, + this.writeSummaryAddressesInSameNetwork(out, rb, relayIp, timestampStr, addressesInSameNetwork); } else { - this.writeSummaryNegative(out, rb, relayIP, timestampStr); + this.writeSummaryNegative(out, rb, relayIp, timestampStr); } - this.writePermanentLink(out, rb, relayIP, timestampStr); + this.writePermanentLink(out, rb, relayIp, timestampStr); this.closeDatabaseConnection(conn, requestedConnection); this.writeFooter(out, rb); @@ -237,7 +239,7 @@ public class ExoneraTorServlet extends HttpServlet { /* Helper methods for handling the request. */ private String parseIpParameter(String passedIpParameter) { - String relayIP = null; + String relayIp = null; if (passedIpParameter != null && passedIpParameter.length() > 0) { String ipParameter = passedIpParameter.trim(); Pattern ipv4AddressPattern = Pattern.compile( @@ -249,7 +251,7 @@ public class ExoneraTorServlet extends HttpServlet { "^\\[?[0-9a-fA-F:]{3,39}\\]?$"); if (ipv4AddressPattern.matcher(ipParameter).matches()) { String[] ipParts = ipParameter.split("\\."); - relayIP = Integer.parseInt(ipParts[0]) + "." + relayIp = Integer.parseInt(ipParts[0]) + "." + Integer.parseInt(ipParts[1]) + "." + Integer.parseInt(ipParts[2]) + "." + Integer.parseInt(ipParts[3]); @@ -281,34 +283,34 @@ public class ExoneraTorServlet extends HttpServlet { "0")); if (!addressHexString.contains("x") && addressHexString.length() == 32) { - relayIP = ipParameter.toLowerCase(); + relayIp = ipParameter.toLowerCase(); } } } } else { - relayIP = ""; + relayIp = ""; } - return relayIP; + return relayIp; } - private String convertIPv4ToHex(String relayIP) { - String[] relayIPParts = relayIP.split("\\."); + private String convertIpV4ToHex(String relayIp) { + String[] relayIpParts = relayIp.split("\\."); byte[] address24Bytes = new byte[4]; for (int i = 0; i < address24Bytes.length; i++) { - address24Bytes[i] = (byte) Integer.parseInt(relayIPParts[i]); + address24Bytes[i] = (byte) Integer.parseInt(relayIpParts[i]); } String address24 = Hex.encodeHexString(address24Bytes); return address24; } - private String convertIPv6ToHex(String relayIP) { - if (relayIP.startsWith("[") && relayIP.endsWith("]")) { - relayIP = relayIP.substring(1, relayIP.length() - 1); + private String convertIpV6ToHex(String relayIp) { + if (relayIp.startsWith("[") && relayIp.endsWith("]")) { + relayIp = relayIp.substring(1, relayIp.length() - 1); } StringBuilder addressHex = new StringBuilder(); - int start = relayIP.startsWith("::") ? 1 : 0; - int end = relayIP.length() - (relayIP.endsWith("::") ? 1 : 0); - String[] parts = relayIP.substring(start, end).split(":", -1); + int start = relayIp.startsWith("::") ? 1 : 0; + int end = relayIp.length() - (relayIp.endsWith("::") ? 1 : 0); + String[] parts = relayIp.substring(start, end).split(":", -1); for (int i = 0; i < parts.length; i++) { String part = parts[i]; if (part.length() == 0) { @@ -361,6 +363,7 @@ public class ExoneraTorServlet extends HttpServlet { try { conn = this.ds.getConnection(); } catch (SQLException e) { + this.logger.log(Level.WARNING, "Couldn't connect: " + e.getMessage(), e); } return conn; } @@ -413,19 +416,19 @@ public class ExoneraTorServlet extends HttpServlet { } private List<String[]> queryStatusEntries(Connection conn, - String relayIP, long timestamp, + String relayIp, long timestamp, SimpleDateFormat validAfterTimeFormat) { List<String[]> statusEntries = new ArrayList<String[]>(); - String addressHex = !relayIP.contains(":") - ? this.convertIPv4ToHex(relayIP) : this.convertIPv6ToHex(relayIP); + String addressHex = !relayIp.contains(":") + ? this.convertIpV4ToHex(relayIp) : this.convertIpV6ToHex(relayIp); if (addressHex == null) { return null; } - String address24Or48Hex = !relayIP.contains(":") + String address24Or48Hex = !relayIp.contains(":") ? addressHex.substring(0, 6) : addressHex.substring(0, 12); try { CallableStatement cs; - if (!relayIP.contains(":")) { + if (!relayIp.contains(":")) { cs = conn.prepareCall("{call search_by_address24_date(?, ?)}"); } else { cs = conn.prepareCall("{call search_by_address48_date(?, ?)}"); @@ -439,9 +442,6 @@ public class ExoneraTorServlet extends HttpServlet { byte[] rawstatusentry = rs.getBytes(1); SortedSet<String> addresses = new TreeSet<String>(); SortedSet<String> addressesHex = new TreeSet<String>(); - long validafter = rs.getTimestamp(2, utcCalendar).getTime(); - String validAfterString = validAfterTimeFormat.format(validafter); - String fingerprint = rs.getString(3).toUpperCase(); String nickname = null; String exit = "U"; for (String line : new String(rawstatusentry).split("\n")) { @@ -449,14 +449,14 @@ public class ExoneraTorServlet extends HttpServlet { String[] parts = line.split(" "); nickname = parts[1]; addresses.add(parts[6]); - addressesHex.add(this.convertIPv4ToHex(parts[6])); + addressesHex.add(this.convertIpV4ToHex(parts[6])); } else if (line.startsWith("a ")) { String address = line.substring("a ".length(), line.lastIndexOf(":")); addresses.add(address); String orAddressHex = !address.contains(":") - ? this.convertIPv4ToHex(address) - : this.convertIPv6ToHex(address); + ? this.convertIpV4ToHex(address) + : this.convertIpV6ToHex(address); addressesHex.add(orAddressHex); } else if (line.startsWith("p ")) { exit = line.equals("p reject 1-65535") ? "N" : "Y"; @@ -465,7 +465,7 @@ public class ExoneraTorServlet extends HttpServlet { String exitaddress = rs.getString(4); if (exitaddress != null && exitaddress.length() > 0) { addresses.add(exitaddress); - addressesHex.add(this.convertIPv4ToHex(exitaddress)); + addressesHex.add(this.convertIpV4ToHex(exitaddress)); } if (!addressesHex.contains(addressHex)) { continue; @@ -475,6 +475,9 @@ public class ExoneraTorServlet extends HttpServlet { for (String address : addresses) { sb.append((writtenAddresses++ > 0 ? ", " : "") + address); } + long validafter = rs.getTimestamp(2, utcCalendar).getTime(); + String validAfterString = validAfterTimeFormat.format(validafter); + String fingerprint = rs.getString(3).toUpperCase(); String[] statusEntry = new String[] { validAfterString, sb.toString(), fingerprint, nickname, exit }; statusEntries.add(statusEntry); @@ -544,6 +547,7 @@ public class ExoneraTorServlet extends HttpServlet { + "after " + (System.currentTimeMillis() - requestedConnection) + " millis."); } catch (SQLException e) { + this.logger.log(Level.WARNING, "Couldn't close: " + e.getMessage(), e); } return; } @@ -585,14 +589,14 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeForm(PrintWriter out, ResourceBundle rb, - String relayIP, boolean relayIPHasError, String timestampStr, + String relayIp, boolean relayIpHasError, String timestampStr, boolean timestampHasError) throws IOException { String ipValue = ""; - if (relayIP != null && relayIP.length() > 0) { - if (relayIP.contains(":")) { - ipValue = String.format(" value=\"[%s]\"", relayIP); + if (relayIp != null && relayIp.length() > 0) { + if (relayIp.contains(":")) { + ipValue = String.format(" value=\"[%s]\"", relayIp); } else { - ipValue = String.format(" value=\"%s\"", relayIP); + ipValue = String.format(" value=\"%s\"", relayIp); } } out.printf(" <div class=\"row\">\n" @@ -623,7 +627,7 @@ public class ExoneraTorServlet extends HttpServlet { + " </div>\n" + " </div>\n", rb.getString("form.explanation"), - relayIPHasError ? " has-error" : "", + relayIpHasError ? " has-error" : "", rb.getString("form.ip.label"), ipValue, timestampHasError ? " has-error" : "", @@ -723,7 +727,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryAddressesInSameNetwork(PrintWriter out, - ResourceBundle rb, String relayIP, String timestampStr, + ResourceBundle rb, String relayIp, String timestampStr, List<String> addressesInSameNetwork) throws IOException { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { @@ -745,26 +749,26 @@ public class ExoneraTorServlet extends HttpServlet { "panel-warning", rb.getString("summary.negativesamenetwork.title"), panelItems, rb.getString("summary.negativesamenetwork.body"), - relayIP, timestampStr, relayIP.contains(":") ? 48 : 24); + relayIp, timestampStr, relayIp.contains(":") ? 48 : 24); } private void writeSummaryPositive(PrintWriter out, ResourceBundle rb, - String relayIP, String timestampStr) throws IOException { - String formattedRelayIP = relayIP.contains(":") - ? "[" + relayIP + "]" : relayIP; + String relayIp, String timestampStr) throws IOException { + String formattedRelayIp = relayIp.contains(":") + ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), "panel-success", rb.getString("summary.positive.title"), null, - rb.getString("summary.positive.body"), formattedRelayIP, + rb.getString("summary.positive.body"), formattedRelayIp, timestampStr); } private void writeSummaryNegative(PrintWriter out, ResourceBundle rb, - String relayIP, String timestampStr) throws IOException { - String formattedRelayIP = relayIP.contains(":") - ? "[" + relayIP + "]" : relayIP; + String relayIp, String timestampStr) throws IOException { + String formattedRelayIp = relayIp.contains(":") + ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), "panel-warning", rb.getString("summary.negative.title"), null, - rb.getString("summary.negative.body"), formattedRelayIP, + rb.getString("summary.negative.body"), formattedRelayIp, timestampStr); } @@ -797,10 +801,10 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeTechnicalDetails(PrintWriter out, ResourceBundle rb, - String relayIP, String timestampStr, List<String[]> tableRows) + String relayIp, String timestampStr, List<String[]> tableRows) throws IOException { - String formattedRelayIP = relayIP.contains(":") - ? "[" + relayIP + "]" : relayIP; + String formattedRelayIp = relayIp.contains(":") + ? "[" + relayIp + "]" : relayIp; out.printf(" <div class=\"row\">\n" + " <div class=\"col-xs-12\">\n" + " <h2>%s</h2>\n" @@ -818,7 +822,7 @@ public class ExoneraTorServlet extends HttpServlet { + " <tbody>\n", rb.getString("technicaldetails.heading"), String.format(rb.getString("technicaldetails.pre"), - formattedRelayIP, timestampStr), + formattedRelayIp, timestampStr), rb.getString("technicaldetails.colheader.timestamp"), rb.getString("technicaldetails.colheader.ip"), rb.getString("technicaldetails.colheader.fingerprint"), @@ -854,9 +858,9 @@ public class ExoneraTorServlet extends HttpServlet { } private void writePermanentLink(PrintWriter out, ResourceBundle rb, - String relayIP, String timestampStr) throws IOException { - String encodedAddress = relayIP.contains(":") - ? "[" + relayIP.replaceAll(":", "%3A") + "]" : relayIP; + String relayIp, String timestampStr) throws IOException { + String encodedAddress = relayIp.contains(":") + ? "[" + relayIp.replaceAll(":", "%3A") + "]" : relayIp; out.printf(" <div class=\"row\">\n" + " <div class=\"col-xs-12\">\n" + " <h2>%s</h2>\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 7c9f5cf090ce4c014539c2443b94ded4ee3499c0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 19:48:42 2016 +0000 Update translations for tails-onioncircuits --- sk_SK/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sk_SK/onioncircuits.pot b/sk_SK/onioncircuits.pot index 09e8ae1..ec3888b 100644 --- a/sk_SK/onioncircuits.pot +++ b/sk_SK/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-06 20:34+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-12 19:43+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "Ešte nie ste pripojení k Tor" #: ../onioncircuits:95 msgid "Onion Circuits"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 574190a85f3e6c8aab2d0f25a8f3240e6a7fae2c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 19:46:21 2016 +0000 Update translations for tails-misc_completed --- sk_SK.po | 417 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 232 insertions(+), 185 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 79d9441..79e9404 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -3,30 +3,32 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 +# Marián Mižik <marian(a)mizik.sk>, 2015 # once, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-07-27 11:30+0000\n" -"Last-Translator: once\n" -"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-07-12 19:41+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" msgstr "Tor je pripravený" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." msgstr "Môžete sa pripojiť na Internet." -#: config/chroot_local-includes/etc/whisperback/config.py:64 +#: config/chroot_local-includes/etc/whisperback/config.py:65 #, python-format msgid "" "<h1>Help us fix your bug!</h1>\n" @@ -34,15 +36,41 @@ msgid "" "<p><strong>Do not include more personal information than\n" "needed!</strong></p>\n" "<h2>About giving us an email address</h2>\n" -"<p>If you don't mind disclosing some bits of your identity\n" -"to Tails developers, you can provide an email address to\n" -"let us ask more details about the bug. Additionally entering\n" -"a public PGP key enables us to encrypt such future\n" -"communication.</p>\n" -"<p>Anyone who can see this reply will probably infer you are\n" -"a Tails user. Time to wonder how much you trust your\n" -"Internet and mailbox providers?</p>\n" -msgstr "<h1>Pomôžte nám s vašou chybou!</h1>\n<p>Prečítajte si <a href=\"%s\">naše inštrukcie hlásenia chýb</a>.</p>\n<p><strong>Neuvádzajte viac osobných informácií, než je skutočne\npotrebné!</strong></p>\n<h2>O poskytnutí vašej e-mailovej adresy</h2>\n<p>Ak vám nevadí, že odhalíte kúsok vašej identity vývojárom Tails,\nmôžete nám poskytnúť e-mailovú adresu, aby sme sa mohli\nspýtať na ďalšie podrobnosti ohľadne hlásenej chyby. Poskytnutie\nverejného PGP kľúča nám dovolí takúto budúcu komunikáciu\nšifrovať.</p>\n<p>Ktokoľvek, kto uvidí takúto odpoveď, si odvodí, že\nste pravdepodobne užívateľ Tails. Tu nastáva čas pouvažovať,\nči skutočne veríte svojim poskytovateľom Internetu a e-mailovej\nschránky.</p>\n" +"<p>\n" +"Giving us an email address allows us to contact you to clarify the problem. This\n" +"is needed for the vast majority of the reports we receive as most reports\n" +"without any contact information are useless. On the other hand it also provides\n" +"an opportunity for eavesdroppers, like your email or Internet provider, to\n" +"confirm that you are using Tails.\n" +"</p>\n" +msgstr "<h1>Pomôžte nám odstrániť chybu!</h1>\n<p>Prečítajte si <a href=\"%s\">naše inštrukcie na nahlasovanie chýb </a>.</p>\n<p><strong>Nezadávajte viac osobných informácií, než\nje nevyhnutné!</strong></p>\n<h2>O zadávaní emailovej adresy</h2>\n<p>\nZadanie emailovej adresy nám umožňuje kontaktovať Vás v prípade nejasností. To\nje potrebné pri väčšine oznamov, ktoré dostaneme, pretože väčšina oznamov\nbez kontaktných údajov je bezcenná. Na druhej strane taktiež poskytuje\npríležitosť pre tých, ktorý tajne odpočúvajú, ako poskytovateľ Vášho emailoveho konta alebo internetu,\nktorí chcú potvrdenie, že používate Tails\n</p>\n" + +#: config/chroot_local-includes/usr/local/bin/electrum:17 +msgid "Persistence is disabled for Electrum" +msgstr "Persistence je vypnuté pre Electrum" + +#: config/chroot_local-includes/usr/local/bin/electrum:19 +msgid "" +"When you reboot Tails, all of Electrum's data will be lost, including your " +"Bitcoin wallet. It is strongly recommended to only run Electrum when its " +"persistence feature is activated." +msgstr "Pri každom opätovnom spustení Tails, stratíte všetky dáta z Electrum, vrátane Vašej Bitcoin peňaženky. Je preto doporučené spúšťať Electrum len vtedy, ak je vlastnosť persistence aktivovaná." + +#: config/chroot_local-includes/usr/local/bin/electrum:21 +msgid "Do you want to start Electrum anyway?" +msgstr "Chcete nepriek tomu spustiť Electum?" + +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:37 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 +msgid "_Launch" +msgstr "_Spustiť" + +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:38 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 +msgid "_Exit" +msgstr "_Ukončiť" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -72,157 +100,163 @@ msgstr "_Dešifrovať/overiť Schránku" msgid "_Manage Keys" msgstr "_Spravovať kľúče" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:244 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:208 +msgid "_Open Text Editor" +msgstr "_Otvoriť textový editor" + +#: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data." msgstr "Schránka neobsahuje platné vstupné údaje." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:294 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:296 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:298 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:307 msgid "Unknown Trust" msgstr "Nejasná dôvera" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:300 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:309 msgid "Marginal Trust" msgstr "Minimálna dôvera" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:302 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:311 msgid "Full Trust" msgstr "Plná dôvera" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:304 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:313 msgid "Ultimate Trust" msgstr "Neobmedzená dôvera" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:357 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:366 msgid "Name" msgstr "Názov" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:367 msgid "Key ID" msgstr "ID kľúča" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:368 msgid "Status" msgstr "Stav" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:391 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:400 msgid "Fingerprint:" msgstr "Odtlačok:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:394 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] "Identifikátor užívateľa:" msgstr[1] "Identifikátor užívateľa:" msgstr[2] "Identifikátory užívateľa:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:424 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" msgstr "Žiadne (Nepodpisovať)" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:487 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 msgid "Select recipients:" msgstr "Vybrať príjemcov:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:495 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Hide recipients" msgstr "Skryť príjemcov" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:498 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:507 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "Skryť identifikátory všetkých príjemcov šifrovanej správy. V opačnom prípade môže ktokoľvek vidieť, kto je príjemcom šifrovanej správy." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:513 msgid "Sign message as:" msgstr "Podpísať správu ako:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:508 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:517 msgid "Choose keys" msgstr "Zvoliť kľúče" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:548 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:557 msgid "Do you trust these keys?" msgstr "Dôverujete týmto kľúčom?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:551 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:560 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] "Nasledujúci zvolený kľúč nemá plnú dôveru:" msgstr[1] "Nasledujúci zvolený kľúč nemá plnú dôveru:" msgstr[2] "Nasledujúce zvolené kľúče nemájú plnú dôveru:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:569 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:578 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "Dôverujete tomuto kľúču natoľko, aby ste ho použili?" msgstr[1] "Dôverujete tomuto kľúčo natoľko, aby ste ho použili?" msgstr[2] "Dôverujete týmto kľúčom natoľko, aby ste ich použili?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:582 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:591 msgid "No keys selected" msgstr "Žiadne vybrané kľúče" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:584 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:593 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "Musíte vybrať súkromný kľúč, ktorým podpíšte správu, verejné kľúče na zašifrovanie správy, alebo oboje." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:612 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:621 msgid "No keys available" msgstr "Žiadne dostupné kľúče" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:614 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:623 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "Potrebujete súkromný kľúč na podpísanie správy alebo verejný kľúč na zašifrovanie správy." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:742 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" msgstr "Chyba GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:763 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." msgstr "Preto nemohla byť operácia vykonaná." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:813 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:822 msgid "GnuPG results" msgstr "Výsledok GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:819 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" msgstr "Výstup GnuPG:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:844 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" msgstr "Ďalšie správy poskytnuté GnuPG:" -#: config/chroot_local-includes/usr/local/bin/iceweasel:12 -msgid "Tor is not ready" -msgstr "Tor nie je pripravený" +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "The <b>Claws Mail</b> persistence feature is activated." +msgstr "Vlastnosť persistence <b>Claws Mail</b> je aktivovaná" -#: config/chroot_local-includes/usr/local/bin/iceweasel:13 -msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor nie je pripravený. Spustiť Tor Browser aj napriek tomu?" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:14 -msgid "Start Tor Browser" -msgstr "Spustiť Tor Browser" +#: config/chroot_local-includes/usr/local/bin/icedove:29 +msgid "" +"If you have emails saved in <b>Claws Mail</b>, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" +" your data</a> before starting <b>Icedove</b>." +msgstr "Ak máte emaily uložené v <b>Claws Mail</b>, mali by ste <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>presunúť Vaše dáta</a> pred spustením <b>Icedove</b>." -#: config/chroot_local-includes/usr/local/bin/iceweasel:15 -msgid "Cancel" -msgstr "Zrušiť" +#: config/chroot_local-includes/usr/local/bin/icedove:34 +msgid "" +"If you already migrated your emails to <b>Icedove</b>, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your <b>Claws Mail</b> data</a> to remove this warning." +msgstr "Ak ste už Vaše dáta presunuli do <b>Icedove</b>, mali by ste <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>zmazať Vaše <b>Claws Mail</b> dáta</a>, aby ste odstránili toto varovanie." -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 -msgid "Shutdown Immediately" -msgstr "Okamžite ukončiť" +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +msgid "Restart" +msgstr "Reštartovať" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 -msgid "Reboot Immediately" -msgstr "Okamžite reštartovať" +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +msgid "Power Off" +msgstr "Vypnúť" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -267,95 +301,62 @@ msgstr "Aktualizácia zlyhala. Toto mohlo nastať z dôvodu problémov s pripoje msgid "The upgrade was successful." msgstr "Aktualizácia prebehla úspešne." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synchronizácia systémového času" -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." msgstr "Tor potrebuje presný čas, aby pracoval správne, hlave kvôli skrytému protokolu Hidden Service. Prosím, čakajte..." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "Synchronizácia času zlyhala!" -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 -msgid "Network connection blocked?" -msgstr "Je pripojenie blokované?" - -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 -msgid "" -"It looks like you are blocked from the network. This may be related to the " -"MAC spoofing feature. For more information, see the <a " -"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" -" spoofing documentation</a>." -msgstr "Zdá sa, že máte blokovaný prístup do siete. To môže súvisieť s funkciou predstierania MAC. Pre viac informácií si otvorte stránku <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">dokumentáciu predstierania MAC</a>." - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:145 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 msgid "This version of Tails has known security issues:" msgstr "Táto verzia Tails má známe bezpečnostné riziká:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +msgid "Known security issues" +msgstr "Známe bezpečnostné hrozby" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "Sieťová karta ${nic} zakázaná" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Predstieranie MAC pre sieťovú kartu ${nic_name} (${nic}) zlyhalo, takže bolo dočasne zakázané.\nMožno bude lepšie reštartovať Tails a zakázať predstieranie MAC. Pozrite si <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentáciu</a>." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}) , takže je dočasne neaktívna.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "Pripojenie celej siete zakázané" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Predstieranie MAC pre sieťovú kartu ${nic_name} (${nic}) zlyhalo. Náprava chyby taktiež zlyhala, takže bolo zakázané celé pripojenie k sieti.\nMožno bude lepšie reštartovať Tails a zakázať predstieranie MAC. Pozrite si <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentáciu</a>." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 -msgid "Starting I2P..." -msgstr "Spúštanie I2P..." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 -msgid "The I2P router console will be opened on start." -msgstr "I2P konzola smerovača bude otvorená po štarte." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 -msgid "I2P failed to start" -msgstr "Zlyhalo spúšťanie I2P" - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 -msgid "" -"Make sure that you have a working Internet connection, then try to start I2P" -" again." -msgstr "Uistite sa, že vaše pripojenie k Internetu pracuje správne a skúste znova spustiť I2P." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}). Obnova po chybe taktiež zlyhala, takže všetky siete sú neaktívne.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy." -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 -msgid "" -"Something went wrong when I2P was starting. Look in the logs in the " -"following directory for more information:" -msgstr "Nastala chyba pri spúšťaní I2P. Pre viac informácií si prezrite záznam konzoly v uvedenom priečinku:" - -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "chyba:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "Chyba" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "<b>Not enough memory available to check for upgrades.</b>\n" "\n" @@ -368,94 +369,152 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "<b>Nedostatok pamäte pre kontrolu aktualizácií.</b>\n\nUistite sa, že tento systém spĺňa požiadavky na beh Tails.\nPozrite si file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSkúste Tails reštartovať a znova prekontrolujte aktualizácie.\n\nAlebo tiež môžete vykonať manuálnu aktualizáciu.\nPozrite si https://tails.boum.org/doc/first_steps/upgrade#manual" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" msgstr "Upozornenie: bol objavený virtuálny stroj!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "Hlavný operačný systém aj virtualizačný software sú schopné monitorovať vašu aktivitu v Tails." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +msgid "Warning: non-free virtual machine detected!" +msgstr "Upozornenie: bol objavený virtuány stroj!" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" -"<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" -" more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Zistiť viac...</a>" +"Both the host operating system and the virtualization software are able to " +"monitor what you are doing in Tails. Only free software can be considered " +"trustworthy, for both the host operating system and the virtualization " +"software." +msgstr "Operačný systém ako aj softvér pre virtualizáciu môžu monitorovať Vašu aktivitu v Tails. Len voľne šíriteľný softvér je možné považovať za dôveryhodný pre operačný systém aj virtualizačný softvér." + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 +msgid "Learn more" +msgstr "Zistite viac" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 +msgid "Tor is not ready" +msgstr "Tor nie je pripravený" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 +msgid "Tor is not ready. Start Tor Browser anyway?" +msgstr "Tor nie je pripravený. Spustiť Tor Browser aj napriek tomu?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 +msgid "Start Tor Browser" +msgstr "Spustiť Tor Browser" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +msgid "Cancel" +msgstr "Zrušiť" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Skutočne si prajete spustiť nezabezpečený prehliadač?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" -"Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" -" the Unsafe Browser if necessary, for example if you have to login or " +"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly " +"use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "Sieťová aktivita nezabezpečeného prehliadača <b>nie je anonymná</b>. Nezabezpečený prehliadač používajte len v nevyhnutných prípadoch, napríklad v prípade prihlásenia sa alebo registrácie vášho internetového pripojenia." - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 -msgid "_Launch" -msgstr "_Spustiť" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 -msgid "_Exit" -msgstr "_Ukončiť" +msgstr "Sieťová aktivita v rámci nezabezpečeného prehliadača <b>nie je anonymná</b>.\\nPoužívajte nezabezpečený prehliadač len v prípade nutnosti, napríklad \\n ak sa musíte prihlásiť alebo registrovať kvôli aktivácii Vášho internetového spojenia." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." msgstr "Spúšťanie nezabezpečeného prehliadača..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." msgstr "Toto môže chvíľu trvať, prosím, buďte trpezliví." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 -msgid "Failed to setup chroot." -msgstr "Nastavenie chroot zlyhalo." - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 -#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 -msgid "Unsafe Browser" -msgstr "Nezabezpečený prehliadač" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." msgstr "Vypínam nezabezpečený prehliadač" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Toto môže chvíľu trvať a nebude možné nezabezpečený prehliadač reštartovať, až kým sa úplne nevypne." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." msgstr "Reštart Tor zlyhal." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 +msgid "Unsafe Browser" +msgstr "Nezabezpečený prehliadač" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Iný nezabezpečený prehliadač je práve spustený alebo sa vypína. Skúste o chvíľu znova, prosím." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +msgid "" +"NetworkManager passed us garbage data when trying to deduce the clearnet DNS" +" server." +msgstr "Pri skúmaní clearnet DNS server, neposkytol sieťový manažér žiadne užitočné informácie." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "Nepodarilo sa získať DNS server pomocou DHCP, ani pomocou manuálneho nastavenia v NetworkManager." -#: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 -msgid "TrueCrypt will soon be removed from Tails" -msgstr "TrueCrypt bude čoskoro z Tails odstránený" +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:122 +msgid "Failed to setup chroot." +msgstr "Nastavenie chroot zlyhalo." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:128 +msgid "Failed to configure browser." +msgstr "Nepodarilo sa nakonfigurovať prehliadač." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:133 +msgid "Failed to run browser." +msgstr "Nepodarilo sa spustiť prehliadač." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 +msgid "I2P failed to start" +msgstr "Zlyhalo spúšťanie I2P" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +msgid "" +"Something went wrong when I2P was starting. Check the logs in /var/log/i2p " +"for more information." +msgstr "Pri spúšťaní I2P sa vyskytla chyba. Skontrolujte záznamy vo /var/log/i2p pre viac informácií." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 +msgid "I2P's router console is ready" +msgstr "Ovládací panel smerovača I2P je pripravený" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Teraz sa môžete pripojiť na I2P v ovládacom panely smerovača v I2P prehliadači." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 +msgid "I2P is not ready" +msgstr "I2P nie je pripravené" -#: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" -"TrueCrypt will soon be removed from Tails due to license and development " -"concerns." -msgstr "TrueCrypt bude čoskoro z Tails odstránený z dôvodu licenčných záležitostí a záležitostí tákajúcich sa vývoja." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Eepsite tunel nebol vytvorený v priebehu šiestich minút. Skontrolujte ovládací panel smerovača v I2P prehliadači alebo záznamy vo /var/log/i2p pre viac informácií. Skúste sa opätovne pripojiť do siete." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 +msgid "I2P is ready" +msgstr "I2P je pripravené" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +msgid "You can now access services on I2P." +msgstr "Teraz sa môžete pripojiť k službám I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -470,37 +529,25 @@ msgstr "Tails dokumentácia" msgid "Learn how to use Tails" msgstr "Naučte sa používať Tails" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 -msgid "Anonymous overlay network " +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 +msgid "Anonymous overlay network browser" msgstr "Anonymná vrstva siete" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 -msgid "i2p" -msgstr "i2p" - -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 -msgid "Anonymous overlay network" -msgstr "Anonymná vrstva siete" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 +msgid "I2P Browser" +msgstr "I2P prehliadač" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" msgstr "Zistiť viac o Tails" -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 -msgid "Reboot" -msgstr "Reštartovať" - -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 -msgid "Immediately reboot computer" -msgstr "Okamžite reštartovať počítač" - -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 -msgid "Power Off" -msgstr "Vypnúť" +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 +msgid "Tor Browser" +msgstr "Tor Browser" -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 -msgid "Immediately shut down computer" -msgstr "Okamžite vypnúť počítač" +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 +msgid "Anonymous Web Browser" +msgstr "Anonymný webový prehliadač" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 0302fffa288258934fe1f7cb213b7f66cbd33cf0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 19:46:17 2016 +0000 Update translations for tails-misc --- sk_SK.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 71bd509..79e9404 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-06 14:26+0200\n" -"PO-Revision-Date: 2016-07-12 19:08+0000\n" +"PO-Revision-Date: 2016-07-12 19:41+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -491,11 +491,11 @@ msgstr "Pri spúšťaní I2P sa vyskytla chyba. Skontrolujte záznamy vo /var/lo #: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" -msgstr "Konzola routeru I2P je pripravená" +msgstr "Ovládací panel smerovača I2P je pripravený" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "Teraz sa môžete pripojiť na I2P router konzolu v I2P prehliadači." +msgstr "Teraz sa môžete pripojiť na I2P v ovládacom panely smerovača v I2P prehliadači." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" @@ -506,7 +506,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Eepsite tunel nebol vytvorený v priebehu šiestich minút. Skontrolujte ovládací panel smerovača v I2P prehliadači alebo záznamy vo /var/log/i2p pre viac informácií. Skúste sa opätovne pripojiť do siete." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 746f3c73603c98253d06c450b9bb86f0d31a2456 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 19:16:17 2016 +0000 Update translations for tails-misc --- sk_SK.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 8ff4c8f..71bd509 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-06 14:26+0200\n" -"PO-Revision-Date: 2016-07-12 18:38+0000\n" +"PO-Revision-Date: 2016-07-12 19:08+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -333,7 +333,7 @@ msgstr "Sieťová karta ${nic} zakázaná" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "Zmena MAC adresy - MAC spoofing zlyhala pre sieťovú kartu ${nic_name} (${nic}) , takže je dočasne neaktívna.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť zmeny MAC adresy." +msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}) , takže je dočasne neaktívna.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy." #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" @@ -344,7 +344,7 @@ msgstr "Pripojenie celej siete zakázané" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "Zmena MAC adresy - MAC spoofing zlyhala pre sieťovú kartu ${nic_name} (${nic}). Obnova po chybe taktiež zlyhala, takže všetky siete sú neaktívne.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť zmeny MAC adresy." +msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}). Obnova po chybe taktiež zlyhala, takže všetky siete sú neaktívne.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -381,7 +381,7 @@ msgstr "Hlavný operačný systém aj virtualizačný software sú schopné moni #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" -msgstr "Upozornenie: bol objavený platený virtuány stroj!" +msgstr "Upozornenie: bol objavený virtuány stroj!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" @@ -459,7 +459,7 @@ msgstr "Iný nezabezpečený prehliadač je práve spustený alebo sa vypína. S msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." -msgstr "" +msgstr "Pri skúmaní clearnet DNS server, neposkytol sieťový manažér žiadne užitočné informácie." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114 msgid "" @@ -495,7 +495,7 @@ msgstr "Konzola routeru I2P je pripravená" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Teraz sa môžete pripojiť na I2P router konzolu v I2P prehliadači." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" @@ -531,7 +531,7 @@ msgstr "Naučte sa používať Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "Anonymná vrstva siete" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit b8b02e702ddcc46e1a41e905ce4381f0a30029a9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 18:48:53 2016 +0000 Update translations for tails-onioncircuits --- ja/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/onioncircuits.pot b/ja/onioncircuits.pot index 6cbed22..821dbd6 100644 --- a/ja/onioncircuits.pot +++ b/ja/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# maruyuki, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-12 18:28+0000\n" +"Last-Translator: maruyuki\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "まだTorに接続していません。" #: ../onioncircuits:95 msgid "Onion Circuits"

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 288dbc09fba807b42780e6762a59cc6c16e7c199 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 18:48:26 2016 +0000 Update translations for tor-messenger-prefsdtd --- ja/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/prefs.dtd b/ja/prefs.dtd index 8526b57..e4f458d 100644 --- a/ja/prefs.dtd +++ b/ja/prefs.dtd @@ -4,7 +4,7 @@ <!ENTITY prefs.otrKeys "自分の秘密鍵"> <!ENTITY prefs.keyForAccount "Key for account:"> <!ENTITY prefs.fingerprint "フィンガープリント:"> -<!ENTITY prefs.knownFingers "Known fingerprints"> +<!ENTITY prefs.knownFingers "既知のフィンガープリント"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "表示"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations.">

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 6c2c0d573cbb75e7862129f38b781109b916de3f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 18:48:00 2016 +0000 Update translations for tor-messenger-fingerdtd --- ja/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/finger.dtd b/ja/finger.dtd index baad075..266f39c 100644 --- a/ja/finger.dtd +++ b/ja/finger.dtd @@ -1,4 +1,4 @@ -<!ENTITY finger.title "Known fingerprints"> +<!ENTITY finger.title "既知のフィンガープリント"> <!ENTITY finger.screenName "スクリーンネーム"> <!ENTITY finger.status "状態"> <!ENTITY finger.verified "確認済み">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 8535e0caf03d37ee59938a6e2d82d86db0c6308b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 18:46:27 2016 +0000 Update translations for tails-misc --- sk_SK.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 20af00e..8ff4c8f 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-06 14:26+0200\n" -"PO-Revision-Date: 2016-07-12 18:16+0000\n" +"PO-Revision-Date: 2016-07-12 18:38+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -381,7 +381,7 @@ msgstr "Hlavný operačný systém aj virtualizačný software sú schopné moni #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" -msgstr "" +msgstr "Upozornenie: bol objavený platený virtuány stroj!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" @@ -389,7 +389,7 @@ msgid "" "monitor what you are doing in Tails. Only free software can be considered " "trustworthy, for both the host operating system and the virtualization " "software." -msgstr "" +msgstr "Operačný systém ako aj softvér pre virtualizáciu môžu monitorovať Vašu aktivitu v Tails. Len voľne šíriteľný softvér je možné považovať za dôveryhodný pre operačný systém aj virtualizačný softvér." #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 msgid "Learn more" @@ -487,11 +487,11 @@ msgstr "Zlyhalo spúšťanie I2P" msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "" +msgstr "Pri spúšťaní I2P sa vyskytla chyba. Skontrolujte záznamy vo /var/log/i2p pre viac informácií." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" -msgstr "" +msgstr "Konzola routeru I2P je pripravená" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." @@ -499,7 +499,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" -msgstr "" +msgstr "I2P nie je pripravené" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" @@ -510,11 +510,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" -msgstr "" +msgstr "I2P je pripravené" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." -msgstr "" +msgstr "Teraz sa môžete pripojiť k službám I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -535,7 +535,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "" +msgstr "I2P prehliadač" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 12 Jul '16

12 Jul '16

commit 8e3d0ba194b5b9b0bc9ae4b3488fd8f996c5f83d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 12 18:46:24 2016 +0000 Update translations for tor-launcher-network-settings_completed --- ja/network-settings.dtd | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index f289507..724a4ee 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "以下のうちあなたの状態に最も適しているのはどれですか？"> <!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は、検閲されているかプロキシを通します。"> -<!ENTITY torSettings.configurePrompt2 "ブリッジやローカルプロキシの設定を構成する必要があります。"> +<!ENTITY torSettings.configurePrompt2 "Torネットワークに接続する前にブリッジやローカルプロキシを設定する必要があります。 "> <!ENTITY torSettings.configure "構成"> -<!ENTITY torSettings.connectPrompt2 "Torネットワークへ直接接続します。"> +<!ENTITY torSettings.connectPrompt2 "Torネットワークに直接接続します。"> <!ENTITY torSettings.connectPrompt3 "これはほとんどの状況で動作します。"> <!ENTITY torSettings.connect "接続"> <!ENTITY torSettings.proxyPageTitle "ローカルプロキシの設定"> <!ENTITY torSettings.proxyQuestion "インターネットに接続するためにローカルプロキシを通す必要がありますか？">  -<!ENTITY torSettings.proxyHelp "もし分からなければ、他のブラウザーのインターネット設定でローカルプロキシを使用しているかを確認してください。"> +<!ENTITY torSettings.proxyExplanation1 "ほとんどの場合ローカルプロキシは必要ありません。ただし、会社、学校、大学などのネットワークを通して接続する場合に必要となることがあるかもしれません。"> +<!ENTITY torSettings.proxyExplanation2 "もし分からなければ、他のブラウザーのインターネット設定やシステムのネットワーク設定を確認して、ローカルプロキシが必要かどうか確認してください。"> <!ENTITY torSettings.enterProxy "プロキシ設定を入力"> <!ENTITY torSettings.bridgePageTitle "Torブリッジの設定"> <!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> -<!ENTITY torSettings.bridgeHelp "この質問にどう答えるべきかよくわからない場合は、いいえを選択してください。  はいを選択すると、Tor ネットワークへの接続をブロックすることをさらに困難にするリスト化されていないリレーである Tor Bridges を構成することが求められます。"> +<!ENTITY torSettings.bridgeExplanation1 "もし分からなければ「いいえ」を選択してください。(ブリッジなしでTorネットワークに接続することができなかった場合、後で追加できます)"> +<!ENTITY torSettings.bridgeExplanation2 "「はい」を選択した場合、TorブリッジすなわちTorネットワークへの接続をブロックすることを難しくするリストされていないリレーを設定するよう求められます。"> <!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。">  <!ENTITY torsettings.startingTor "Torの開始を待っています..."> <!ENTITY torsettings.restartTor "Torを再起動する"> +<!ENTITY torsettings.reconfigTor "再設定"> + +<!ENTITY torsettings.discardSettings.prompt "Torブリッジが設定されるか、ローカルプロキシ設定が入力されるかしました。  Torネットワークに直接接続するためには、これらの設定は削除する必要があります。"> +<!ENTITY torsettings.discardSettings.proceed "設定と接続を削除"> <!ENTITY torsettings.optional "オプション"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> <!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします"> <!ENTITY torsettings.useBridges.default "提供されたブリッジで接続"> +<!ENTITY torsettings.useBridges.note "それぞれの種類のブリッジは検閲を避けるために異なった方法を使用します。 もしひとつのブリッジが機能しなければ、別のもので再度試してみてください。"> <!ENTITY torsettings.useBridges.type "トランスポートタイプ:"> <!ENTITY torsettings.useBridges.custom "カスタムブリッジを入力"> <!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。"> @@ -58,7 +65,7 @@ <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。  ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> -<!ENTITY torsettings.bridgeHelp1B "事前設定された提供されたブリッジアドレスのセットを使用するか、あるいは以下の3つの方法のいずれかを用いてカスタムのアドレスのセットを取得することができます。"> +<!ENTITY torsettings.bridgeHelp1B "設定済みのデフォルトの設定を利用するか、以下のうちのいずれかの方法によってカスタムのアドレスセットを取得することができます。"> <!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> <!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> <!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由">

1 0