- tor-commits - lists.torproject.org

[metrics-web/master] List version 1.1 bridge extra-infos.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 4747c5d92fb3382b8dd629f44c544a555756bfba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 14:00:04 2012 +0200 List version 1.1 bridge extra-infos. --- web/WEB-INF/formats.jsp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 5eabf0d..98f928b 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -83,7 +83,9 @@ are recent: <li><tt>@type network-status-vote-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li> -<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.1</tt> contain sanitized + <tt>transport</tt> lines</li> <li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type gettor 1.0</tt></li>

1 0

[metrics-db/master] Bump to @type bridge-extra-info 1.1.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit ba749152d36c4797036008ec57c4e7d7187ccef0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:56:04 2012 +0200 Bump to @type bridge-extra-info 1.1. --- .../ernie/db/SanitizedBridgesWriter.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index c72ec9f..366da00 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -849,7 +849,7 @@ public class SanitizedBridgesWriter { try { newFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(newFile)); - bw.write("@type bridge-extra-info 1.0\n"); + bw.write("@type bridge-extra-info 1.1\n"); bw.write(scrubbedDesc); bw.write("router-digest " + descriptorDigest.toUpperCase() + "\n"); bw.close();

1 0

[metrics-lib/master] Parse transport lines in bridge extra-infos.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit ca201de75e451e1131e1ae68f7cdfb24280c36be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:54:31 2012 +0200 Parse transport lines in bridge extra-infos. --- .../torproject/descriptor/ExtraInfoDescriptor.java | 4 ++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/org/torproject/descriptor/ExtraInfoDescriptor.java index 229b075..05707a5 100644 --- a/src/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -237,5 +237,9 @@ public interface ExtraInfoDescriptor extends Descriptor { * have connected from that country rounded up to the nearest multiple * of 8, or null if no bridge statistics are included. */ public SortedMap<String, Integer> getBridgeIps(); + + /* Return the (possibly empty) list of transports supported by this + * bridge. */ + public List<String> getTransports(); } diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index f6e0fd9..0a0bf1a 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -166,6 +166,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.parseBridgeStatsEndLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("bridge-ips")) { this.parseBridgeStatsIpsLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("transport")) { + this.parseTransportLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-signature")) { this.parseRouterSignatureLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-digest")) { @@ -567,6 +569,14 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl partsNoOpt, 1, 2); } + private void parseTransportLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.transports.add(partsNoOpt[1]); + } + private void parseRouterSignatureLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (!lineNoOpt.equals("router-signature")) { @@ -869,5 +879,10 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl return this.bridgeIps == null ? null : new TreeMap<String, Integer>(this.bridgeIps); } + + private List<String> transports = new ArrayList<String>(); + public List<String> getTransports() { + return new ArrayList<String>(this.transports); + } }

1 0

[metrics-lib/master] We can parse all @type 1.x descriptor versions.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 0c19088c4b6bbd242ccbba12b9e390b5cf6a2cf3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:29:05 2012 +0200 We can parse all @type 1.x descriptor versions. --- .../torproject/descriptor/impl/DescriptorImpl.java | 24 ++++++++++---------- 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 98be2d8..bb6e415 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -26,33 +26,33 @@ public abstract class DescriptorImpl implements Descriptor { System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, first100Chars.length); String firstLines = new String(first100Chars); - if (firstLines.startsWith("@type network-status-consensus-3 1.0\n") || + if (firstLines.startsWith("@type network-status-consensus-3 1.") || ((firstLines.startsWith("network-status-version 3\n") || firstLines.contains("\nnetwork-status-version 3\n")) && firstLines.contains("\nvote-status consensus\n"))) { parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. parseConsensuses(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type network-status-vote-3 1.0\n") + } else if (firstLines.startsWith("@type network-status-vote-3 1.") || ((firstLines.startsWith("network-status-version 3\n") || firstLines.contains("\nnetwork-status-version 3\n")) && firstLines.contains("\nvote-status vote\n"))) { parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. parseVotes(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type bridge-network-status 1.0\n") + } else if (firstLines.startsWith("@type bridge-network-status 1.") || firstLines.startsWith("r ")) { parsedDescriptors.add(new BridgeNetworkStatusImpl( rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type server-descriptor 1.0\n") || - firstLines.startsWith("@type bridge-server-descriptor 1.0\n") || + } else if (firstLines.startsWith("@type server-descriptor 1.") || + firstLines.startsWith("@type bridge-server-descriptor 1.") || firstLines.startsWith("router ") || firstLines.contains("\nrouter ")) { parsedDescriptors.addAll(ServerDescriptorImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type extra-info 1.0\n") || - firstLines.startsWith("@type bridge-extra-info 1.0\n") || + } else if (firstLines.startsWith("@type extra-info 1.") || + firstLines.startsWith("@type bridge-extra-info 1.") || firstLines.startsWith("extra-info ") || firstLines.contains("\nextra-info ")) { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. @@ -64,7 +64,7 @@ public abstract class DescriptorImpl implements Descriptor { parsedDescriptors.addAll(BridgePoolAssignmentImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type dir-key-certificate-3 1.0") || + } else if (firstLines.startsWith("@type dir-key-certificate-3 1.") || firstLines.startsWith("dir-key-certificate-version ") || firstLines.contains("\ndir-key-certificate-version ")) { parsedDescriptors.addAll(DirectoryKeyCertificateImpl. @@ -75,20 +75,20 @@ public abstract class DescriptorImpl implements Descriptor { firstLines.contains("\nExitNode ")) { parsedDescriptors.add(new ExitListImpl(rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type network-status-2 1.0\n") || + } else if (firstLines.startsWith("@type network-status-2 1.") || firstLines.startsWith("network-status-version 2\n") || firstLines.contains("\nnetwork-status-version 2\n")) { parsedDescriptors.add(new RelayNetworkStatusImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type directory 1.0\n") || + } else if (firstLines.startsWith("@type directory 1.") || firstLines.startsWith("signed-directory\n") || firstLines.contains("\nsigned-directory\n")) { parsedDescriptors.add(new RelayDirectoryImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type torperf 1.0\n")) { + } else if (firstLines.startsWith("@type torperf 1.")) { parsedDescriptors.addAll(TorperfResultImpl.parseTorperfResults( rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type gettor 1.0\n")) { + } else if (firstLines.startsWith("@type gettor 1.")) { parsedDescriptors.addAll(GetTorStatisticsImpl.parseGetTorStatistics( rawDescriptorBytes, failUnrecognizedDescriptorLines)); } else {

1 0

[metrics-web/master] Document how we sanitize pluggable transport lines.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 5de9ed2a350a3219a018d0b62446a991331a763c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 12:55:06 2012 +0200 Document how we sanitize pluggable transport lines. --- web/WEB-INF/formats.jsp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 1392a2b..5eabf0d 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -350,6 +350,11 @@ long and the <tt>secret</tt> is only 19 bytes long.</li></ul> <li>Replace contact information: If there is contact information in a descriptor, the contact line is changed to <tt>somebody</tt>.</li> +<li>Remove pluggable transport addresses and arguments: Bridges may +provide transports in addition to the onion-routing protocol and include +information about these transports in their extra-info descriptors for +BridgeDB. In that case, any IP addresses, TCP ports, or additional +arguments are removed, only leaving in the supported transport names.</li> </ol>

1 0

[metrics-db/master] Sanitize pluggable transport lines in bridge descriptors.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 4d8287948849fcb1de17080d83bb008f65b487ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 12:43:10 2012 +0200 Sanitize pluggable transport lines in bridge descriptors. Implements #4957. --- .../ernie/db/SanitizedBridgesWriter.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index d138dbc..c72ec9f 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -760,6 +760,19 @@ public class SanitizedBridgesWriter { scrubbed.append(line + "\n"); published = line.substring("published ".length()); + /* Remove everything from transport lines except the transport + * name. */ + } else if (line.startsWith("transport ")) { + if (parts.length < 3) { + this.logger.fine("Illegal line in extra-info descriptor: '" + + line + "'. Skipping descriptor."); + return; + } + scrubbed.append("transport " + parts[1] + "\n"); + + /* Skip transport-info lines entirely. */ + } else if (line.startsWith("transport-info ")) { + /* Write the following lines unmodified to the sanitized * descriptor. */ } else if (line.startsWith("write-history ")

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit ef88f9abaa965b1cd130069c61253983ac33a63c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:45:11 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index c3eece4..3c20ef6 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-06-05 09:52+0000\n" -"Last-Translator: tor.korean.translate <>\n" +"PO-Revision-Date: 2012-06-29 09:23+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2692,7 +2692,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "하나 이상의 bridge를 지정해야 합니다." msgctxt "Policy" msgid "accept" @@ -3116,11 +3116,11 @@ msgstr "자동적으로 나의 브릿지 주소 배포" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Tor 네트워크를 위해 트래픽을 중계 (출구 중계)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Tor 네트워크를 위해 트래픽을 중계 (출구 중계 아님)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit 18dc061fe0f35692324a1cef20ede714ecab67aa Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:45:08 2012 +0000 Update translations for orbot --- values-ko/strings.xml | 56 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/values-ko/strings.xml b/values-ko/strings.xml index 144db09..ca1f770 100644 --- a/values-ko/strings.xml +++ b/values-ko/strings.xml @@ -7,8 +7,8 @@ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> <string name="control_permission_label">start and stop Tor</string> <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting...</string> - <string name="status_activated">Connected to the Tor network</string> + <string name="status_starting_up">Orbot이 시작중...</string> + <string name="status_activated">Tor 네트워크에 연결됨</string> <string name="status_disabled">\"Orbot is Deactivated</string> <string name="status_shutting_down">Orbot is shutting down</string> <string name="tor_process_starting">Starting Tor client...</string> @@ -31,7 +31,6 @@ <string name="button_clear_log">Clear Log</string> <string name="menu_verify">Check</string> <string name="menu_exit">Exit</string> - <string name="powered_by">powered by the Tor Project</string> <string name="press_to_start">- long press to start -</string> <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> <string name="pref_trans_proxy_title">Transparent Proxying</string> @@ -55,6 +54,7 @@ <string name="btn_finish">Finish</string> <string name="btn_okay">Okay</string> <string name="btn_cancel">Cancel</string> +  <string name="wizard_details">Some Orbot Details</string> <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> <string name="wizard_permissions_root">Permission Granted</string> @@ -73,31 +73,38 @@ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n - The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible. - \n\n - You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid - </string> + <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot is ready!</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> +  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> +  +  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> +  <string name="wizard_warning_title">Warning</string> <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> +  <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> +  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> @@ -112,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -149,7 +157,9 @@ <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="bridges">Bridges</string> <string name="use_bridges">Use Bridges</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> <string name="enter_bridge_addresses">Enter Bridge Addresses</string> <string name="relays">Relays</string> @@ -166,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -177,11 +187,11 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> @@ -193,4 +203,12 @@ <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + <string name="notification_using_bridges">Bridges enabled!</string> + <string name="default_bridges"/> + <string name="set_locale_title">Set Locale</string> + <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="powered_by">powered by The Tor Project </string> + <string name="btn_save_settings">Save Settings</string> </resources>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit 4989d2de9756ee98522e509a17cdd9bb9ce36bb6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:45:03 2012 +0000 Update translations for gettor --- ko/gettor.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index 2193a2b..4b468b6 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-06-29 09:14+0000\n" +"PO-Revision-Date: 2012-06-29 09:21+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "이 메일에 답변해 주십시오. 그리도 하나의 패키지 이 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "" +msgstr "Tor 지역화 버전 얻기\n================" #: lib/gettor/i18n.py:62 msgid "" @@ -85,18 +85,18 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "" +msgstr "귀하의 언어로 번역된 Tor를 얻고 싶으시다면 귀하가 원하는 언어를 주소에 붙여 주십시오.\n\n gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "" +msgstr "이 예는 페르시아어 버전을 보내 줄 것입니다. 지원하는 언어 코드의 목록을 아래에서 확인하십시오." #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "" +msgstr "지원하는 로케일 목록" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -188,7 +188,7 @@ msgstr "" #: lib/gettor/i18n.py:125 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "" +msgstr "6) 끝났습니다. Tor를 사용해 주셔서 감사하고 즐겨 주시기를 부탁드립니다." #: lib/gettor/i18n.py:127 msgid "" @@ -241,7 +241,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "만약 귀하의 인터넷 연결이 Tor 네트워크 연결을 막는다면, bridge 중계가 필요할 지도 모릅니다. Bridge 중계(또는 bridge로 짧게)는 메인 디렉토리에 있지 않는 Tor 중계서버입니다. 중계서버에 대한 완벽한 목록이 없기 때문에, 심지어 ISP가 잘 알려진 Tor 중계서버에 대한 연결을 막더라고, 그들은 아마 모든 birdge를 막을 수는 없을 것이빈다." #: lib/gettor/i18n.py:162 msgid "" @@ -255,7 +255,7 @@ msgstr "" msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "" +msgstr "또한 다음 주소로 bridge 주소를 얻을 수도 있습니다 : https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -372,7 +372,7 @@ msgstr "주의 : 이 패키지는 30MB보다 크므로 이메일 제공자가 30 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." -msgstr "" +msgstr "linux-x86_64:\n64bit 리눅스를 위한 Tor Browser Bundle입니다." #: lib/gettor/i18n.py:235 msgid "" @@ -384,11 +384,11 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "FAQ\n==================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "Tor는 무엇입니까?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." @@ -409,18 +409,18 @@ msgstr "" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Tor Browser Bundle이 무엇입니까?" #: lib/gettor/i18n.py:257 msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "" +msgstr "Tor browser Bundle(TTB)는 대부분의 사용자에게 추천되는 패키지입니다. TTB는 안전하게 인터넷을 이용할 수 있는 모든 준비가 되어 있습니다. 그냥 압축을 풀고 실행하십시오." #: lib/gettor/i18n.py:261 msgid "What package should I request?" -msgstr "" +msgstr "제가 받아야 하는 패키지는 무엇입니까?" #: lib/gettor/i18n.py:263 msgid "" @@ -436,11 +436,11 @@ msgstr "" #: lib/gettor/i18n.py:270 msgid "QUESTION:" -msgstr "" +msgstr "질문:" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "" +msgstr "답변:" #: lib/gettor/i18n.py:274 #, python-format

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit bc630110bd0d7c10f581fd22e0c1a8cf58437ed0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:56 2012 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index d4166f3..61c3ead 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -5,13 +5,13 @@ <!ENTITY https-everywhere.about.version "Version"> <!ENTITY https-everywhere.about.created_by ""> <!ENTITY https-everywhere.about.librarians ""> -<!ENTITY https-everywhere.about.thanks ""> +<!ENTITY https-everywhere.about.thanks "Thanks to"> <!ENTITY https-everywhere.about.contribute ""> -<!ENTITY https-everywhere.about.donate_tor ""> -<!ENTITY https-everywhere.about.tor_lang_code ""> -<!ENTITY https-everywhere.about.donate_eff ""> +<!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기"> +<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기"> -<!ENTITY https-everywhere.menu.about ""> +<!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여"> <!ENTITY https-everywhere.menu.observatory ""> <!ENTITY https-everywhere.menu.globalEnable ""> <!ENTITY https-everywhere.menu.globalDisable "">

1 0