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

[arm/master] Moving flag and version status colors to config
by atagar＠torproject.org 24 Feb '14

24 Feb '14

commit df481c6ba04361210da781080c9c53608d762a65 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 15 14:08:53 2014 -0800 Moving flag and version status colors to config Moving some static configuration data from our source to a new attributes configuration. --- arm/config/attributes.cfg | 25 +++++++++++++++++++++++++ arm/header_panel.py | 37 ++++++------------------------------- arm/util/ui_tools.py | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/arm/config/attributes.cfg b/arm/config/attributes.cfg new file mode 100644 index 0000000..340cbdc --- /dev/null +++ b/arm/config/attributes.cfg @@ -0,0 +1,25 @@ +# General configuration data used by arm. + +attr.flag_colors Authority => white +attr.flag_colors BadExit => red +attr.flag_colors BadDirectory => red +attr.flag_colors Exit => cyan +attr.flag_colors Fast => yellow +attr.flag_colors Guard => green +attr.flag_colors HSDir => magenta +attr.flag_colors Named => blue +attr.flag_colors Stable => blue +attr.flag_colors Running => yellow +attr.flag_colors Unnamed => magenta +attr.flag_colors Valid => green +attr.flag_colors V2Dir => cyan +attr.flag_colors V3Dir => white + +attr.version_status_colors new => blue +attr.version_status_colors new in series => blue +attr.version_status_colors obsolete => red +attr.version_status_colors recommended => green +attr.version_status_colors old => red +attr.version_status_colors unrecommended => red +attr.version_status_colors unknown => cyan + diff --git a/arm/header_panel.py b/arm/header_panel.py index 6232da3..de3c5a8 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -36,35 +36,10 @@ from util import panel, ui_tools, tor_controller MIN_DUAL_COL_WIDTH = 141 -FLAG_COLORS = { - "Authority": "white", - "BadExit": "red", - "BadDirectory": "red", - "Exit": "cyan", - "Fast": "yellow", - "Guard": "green", - "HSDir": "magenta", - "Named": "blue", - "Stable": "blue", - "Running": "yellow", - "Unnamed": "magenta", - "Valid": "green", - "V2Dir": "cyan", - "V3Dir": "white", -} - -VERSION_STATUS_COLORS = { - "new": "blue", - "new in series": "blue", - "obsolete": "red", - "recommended": "green", - "old": "red", - "unrecommended": "red", - "unknown": "cyan", -} - -CONFIG = conf.config_dict("arm", { - "features.showFdUsage": False, +CONFIG = conf.config_dict('arm', { + 'attr.flag_colors': {}, + 'attr.version_status_colors': {}, + 'features.showFdUsage': False, }) @@ -238,7 +213,7 @@ class HeaderPanel(panel.Panel, threading.Thread): if 7 + len(self.vals["tor/version"]) + len(self.vals["tor/versionStatus"]) <= content_space: if self.vals["tor/version"] != "Unknown": - version_color = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" + version_color = CONFIG['attr.version_status_colors'].get(self.vals["tor/versionStatus"], 'white') label_prefix = "Tor %s (" % self.vals["tor/version"] self.addstr(0, 43, label_prefix) @@ -380,7 +355,7 @@ class HeaderPanel(panel.Panel, threading.Thread): if len(self.vals["tor/flags"]) > 0: for i in range(len(self.vals["tor/flags"])): flag = self.vals["tor/flags"][i] - flag_color = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" + flag_color = CONFIG['attr.flag_colors'].get(flag, 'white') self.addstr(y, x, flag, curses.A_BOLD | ui_tools.get_color(flag_color)) x += len(flag) diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index 9e4a622..2b24b83 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -129,7 +129,7 @@ def _color_attr(): if not CONFIG['features.colorInterface']: COLOR_ATTR = DEFAULT_COLOR_ATTR elif curses.has_colors(): - color_attr = dict([(color, 0) for color in COLOR_LIST]) + color_attr = dict(DEFAULT_COLOR_ATTR) for color_pair, color_name in enumerate(COLOR_LIST): foreground_color = COLOR_LIST[color_name]

1 0

[arm/master] Dropping the notion of static header parameters
by atagar＠torproject.org 24 Feb '14

24 Feb '14

commit 4c5c20be5c30cb120c61a58e47fdfb821932cc75 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 16 04:25:22 2014 -0800 Dropping the notion of static header parameters The header panel split the attributes it used into two camps: static and volatile. The reason for this is that we wanted to avoid repeatedly querying things that rarely change. However, the stem controller caches static values for us anyway so we can drop this. The only additional burden this is adding is for the process' start time. This is now fetched on each call - haven't yet decided how we want to handle those. --- arm/header_panel.py | 150 +++++++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index de3c5a8..2affaad 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -98,7 +98,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals = {} self.vals_lock = threading.RLock() - self._update(True) + self._update() # listens for tor reload (sighup) events @@ -494,7 +494,7 @@ class HeaderPanel(panel.Panel, threading.Thread): initial_height = self.get_height() self._is_tor_connected = True self._halt_time = None - self._update(True) + self._update() if self.get_height() != initial_height: # We're toggling between being a relay and client, causing the height @@ -511,125 +511,121 @@ class HeaderPanel(panel.Panel, threading.Thread): self._update() self.redraw(True) - def _update(self, set_static=False): + def _update(self): """ Updates stats in the vals mapping. By default this just revises volatile attributes. - - Arguments: - set_static - resets all parameters, including relatively static values """ self.vals_lock.acquire() controller = tor_controller() - if set_static: - # version is truncated to first part, for instance: - # 0.2.2.13-alpha (git-feb8c1b5f67f2c6f) -> 0.2.2.13-alpha + # version is truncated to first part, for instance: + # 0.2.2.13-alpha (git-feb8c1b5f67f2c6f) -> 0.2.2.13-alpha - self.vals["tor/version"] = controller.get_info("version", "Unknown").split()[0] - self.vals["tor/versionStatus"] = controller.get_info("status/version/current", "Unknown") - self.vals["tor/nickname"] = controller.get_conf("Nickname", "") - self.vals["tor/or_port"] = controller.get_conf("ORPort", "0") - self.vals["tor/dir_port"] = controller.get_conf("DirPort", "0") - self.vals["tor/control_port"] = controller.get_conf("ControlPort", "0") - self.vals["tor/socketPath"] = controller.get_conf("ControlSocket", "") - self.vals["tor/isAuthPassword"] = controller.get_conf("HashedControlPassword", None) is not None - self.vals["tor/isAuthCookie"] = controller.get_conf("CookieAuthentication", None) == "1" + self.vals['tor/version'] = str(controller.get_version('Unknown')).split()[0] + self.vals['tor/versionStatus'] = controller.get_info('status/version/current', 'Unknown') + self.vals['tor/nickname'] = controller.get_conf('Nickname', '') + self.vals['tor/or_port'] = controller.get_conf('ORPort', '0') + self.vals['tor/dir_port'] = controller.get_conf('DirPort', '0') + self.vals['tor/control_port'] = controller.get_conf('ControlPort', '0') + self.vals['tor/socketPath'] = controller.get_conf('ControlSocket', '') + self.vals['tor/isAuthPassword'] = controller.get_conf('HashedControlPassword', None) is not None + self.vals['tor/isAuthCookie'] = controller.get_conf('CookieAuthentication', None) == '1' - # orport is reported as zero if unset + # orport is reported as zero if unset - if self.vals["tor/or_port"] == "0": - self.vals["tor/or_port"] = "" + if self.vals['tor/or_port'] == '0': + self.vals['tor/or_port'] = '' - # overwrite address if ORListenAddress is set (and possibly or_port too) + # overwrite address if ORListenAddress is set (and possibly or_port too) - self.vals["tor/orListenAddr"] = "" - listen_addr = controller.get_conf("ORListenAddress", None) + self.vals['tor/orListenAddr'] = '' + listen_addr = controller.get_conf('ORListenAddress', None) - if listen_addr: - if ":" in listen_addr: - # both ip and port overwritten - self.vals["tor/orListenAddr"] = listen_addr[:listen_addr.find(":")] - self.vals["tor/or_port"] = listen_addr[listen_addr.find(":") + 1:] - else: - self.vals["tor/orListenAddr"] = listen_addr + if listen_addr: + if ':' in listen_addr: + # both ip and port overwritten + self.vals['tor/orListenAddr'] = listen_addr[:listen_addr.find(':')] + self.vals['tor/or_port'] = listen_addr[listen_addr.find(':') + 1:] + else: + self.vals['tor/orListenAddr'] = listen_addr - # fetch exit policy (might span over multiple lines) + # fetch exit policy (might span over multiple lines) - policy_entries = [] + policy_entries = [] - for exit_policy in controller.get_conf("ExitPolicy", [], True): - policy_entries += [policy.strip() for policy in exit_policy.split(",")] + for exit_policy in controller.get_conf('ExitPolicy', [], True): + policy_entries += [policy.strip() for policy in exit_policy.split(',')] - self.vals["tor/exit_policy"] = ", ".join(policy_entries) + self.vals['tor/exit_policy'] = ', '.join(policy_entries) - # file descriptor limit for the process, if this can't be determined - # then the limit is None + # file descriptor limit for the process, if this can't be determined + # then the limit is None - fd_limit = controller.get_info('process/descriptor-limit', '-1') + fd_limit = controller.get_info('process/descriptor-limit', '-1') - if fd_limit != '-1' and fd_limit.isdigit(): - self.vals["tor/fd_limit"] = int(fd_limit) - else: - self.vals["tor/fd_limit"] = None + if fd_limit != '-1' and fd_limit.isdigit(): + self.vals['tor/fd_limit'] = int(fd_limit) + else: + self.vals['tor/fd_limit'] = None - # system information + # system information - uname_vals = os.uname() - self.vals["sys/hostname"] = uname_vals[1] - self.vals["sys/os"] = uname_vals[0] - self.vals["sys/version"] = uname_vals[2] + uname_vals = os.uname() + self.vals['sys/hostname'] = uname_vals[1] + self.vals['sys/os'] = uname_vals[0] + self.vals['sys/version'] = uname_vals[2] - self.vals["tor/pid"] = controller.get_pid("") + self.vals['tor/pid'] = controller.get_pid('') - try: - start_time = system.get_start_time(controller.get_pid()) - except: - start_time = None + try: + start_time = system.get_start_time(controller.get_pid()) + except: + start_time = None - self.vals["tor/start_time"] = start_time if start_time else "" + self.vals['tor/start_time'] = start_time if start_time else '' - # reverts volatile parameters to defaults + # reverts volatile parameters to defaults - self.vals["tor/fingerprint"] = "Unknown" - self.vals["tor/flags"] = [] - self.vals["tor/fd_used"] = 0 - self.vals["stat/%torCpu"] = "0" - self.vals["stat/%armCpu"] = "0" - self.vals["stat/rss"] = "0" - self.vals["stat/%mem"] = "0" + self.vals['tor/fingerprint'] = 'Unknown' + self.vals['tor/flags'] = [] + self.vals['tor/fd_used'] = 0 + self.vals['stat/%torCpu'] = '0' + self.vals['stat/%armCpu'] = '0' + self.vals['stat/rss'] = '0' + self.vals['stat/%mem'] = '0' # sets volatile parameters # TODO: This can change, being reported by STATUS_SERVER -> EXTERNAL_ADDRESS # events. Introduce caching via tor_tools? - self.vals["tor/address"] = controller.get_info("address", "") + self.vals['tor/address'] = controller.get_info('address', '') - self.vals["tor/fingerprint"] = controller.get_info("fingerprint", self.vals["tor/fingerprint"]) + self.vals['tor/fingerprint'] = controller.get_info('fingerprint', self.vals['tor/fingerprint']) - my_fingerprint = controller.get_info("fingerprint", None) + my_fingerprint = controller.get_info('fingerprint', None) if my_fingerprint: my_status_entry = controller.get_network_status(my_fingerprint) if my_status_entry: - self.vals["tor/flags"] = my_status_entry.flags + self.vals['tor/flags'] = my_status_entry.flags # Updates file descriptor usage and logs if the usage is high. If we don't # have a known limit or it's obviously faulty (being lower than our # current usage) then omit file descriptor functionality. - if self.vals["tor/fd_limit"]: + if self.vals['tor/fd_limit']: fd_used = get_file_descriptor_usage(controller.get_pid(None)) - if fd_used and fd_used <= self.vals["tor/fd_limit"]: - self.vals["tor/fd_used"] = fd_used + if fd_used and fd_used <= self.vals['tor/fd_limit']: + self.vals['tor/fd_used'] = fd_used else: - self.vals["tor/fd_used"] = 0 + self.vals['tor/fd_used'] = 0 - if self.vals["tor/fd_used"] and self.vals["tor/fd_limit"]: - fd_percent = 100 * self.vals["tor/fd_used"] / self.vals["tor/fd_limit"] + if self.vals['tor/fd_used'] and self.vals['tor/fd_limit']: + fd_percent = 100 * self.vals['tor/fd_used'] / self.vals['tor/fd_limit'] msg = "Tor's file descriptor usage is at %i%%." % fd_percent if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: @@ -642,14 +638,14 @@ class HeaderPanel(panel.Panel, threading.Thread): # ps or proc derived resource usage stats - if self.vals["tor/pid"]: + if self.vals['tor/pid']: resource_tracker = arm.util.tracker.get_resource_tracker() resources = resource_tracker.get_resource_usage() self._last_resource_fetch = resource_tracker.run_counter() - self.vals["stat/%torCpu"] = "%0.1f" % (100 * resources.cpu_sample) - self.vals["stat/rss"] = str(resources.memory_bytes) - self.vals["stat/%mem"] = "%0.1f" % (100 * resources.memory_percent) + self.vals['stat/%torCpu'] = '%0.1f' % (100 * resources.cpu_sample) + self.vals['stat/rss'] = str(resources.memory_bytes) + self.vals['stat/%mem'] = '%0.1f' % (100 * resources.memory_percent) # determines the cpu time for the arm process (including user and system # time of both the primary and child processes) @@ -659,7 +655,7 @@ class HeaderPanel(panel.Panel, threading.Thread): arm_time_delta = current_time - self._arm_cpu_sampling[1] python_cpu_time = arm_cpu_telta / arm_time_delta sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this - self.vals["stat/%armCpu"] = "%0.1f" % (100 * (python_cpu_time + sys_call_cpu_time)) + self.vals['stat/%armCpu'] = '%0.1f' % (100 * (python_cpu_time + sys_call_cpu_time)) self._arm_cpu_sampling = (total_arm_cpu_time, current_time) self._last_update = current_time

1 0

[torspec/master] Typos.
by nickm＠torproject.org 24 Feb '14

24 Feb '14

commit 65c048ea31a10e8c30a3c9e4dd3d92bad8f7eccb Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Feb 20 16:44:21 2014 +0000 Typos. --- proposals/220-ecc-id-keys.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index b14fea7..cb8cf83 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -11,8 +11,8 @@ Status: Draft 0. Introduction - In current Tor designs, identity keys are limited to 1024-bit RSA - keys. + In current Tor designs, router identity keys are limited to + 1024-bit RSA keys. Clearly, that should change, because RSA doesn't represent a good performance-security tradeoff nowadays, and because 1024-bit RSA is @@ -181,7 +181,7 @@ Status: Draft Current versions of Tor will handle these new formats by ignoring the new fields, and not checking any ed25519 information. - New version of Tor will have a flag that tells them whether to check + New versions of Tor will have a flag that tells them whether to check ed25519 information. When it is set, they must check: * All RSA information and signatures that Tor implementations @@ -199,7 +199,7 @@ Status: Draft 2.3.2. Extra-info documents - Extrainfo documents now include "identity-ed25519" and + Extra-info documents now include "identity-ed25519" and "router-signature-ed25519" fields in the same positions in which they appear in router descriptors. @@ -358,7 +358,7 @@ Status: Draft SIGNATURE [64 bytes] where CERT_DIGEST is a SHA256 digest of the X.509 certificate used for the TLS link, EXPIRATION_DATE is a date in *days* since the epoch - starting on which the certificate is invalid, and SIGNATURE is + on which the certificate is invalid, and SIGNATURE is a signature using the signing key of the above two fields, prefixed with "Tor TLS link certificate check v1". @@ -488,7 +488,7 @@ Status: Draft 7. Hidden service changes out of scope - Hidden services need to be able to identity nodes by ECC keys, just as + Hidden services need to be able to identify nodes by ECC keys, just as they will need to include ntor keys as well as TAP keys. Not just yet though. This needs to be part of a bigger hidden service revamping strategy.

1 0

[torspec/master] Merge remote-tracking branch 'linus/prop220-nits'
by nickm＠torproject.org 24 Feb '14

24 Feb '14

commit 92cc4f9c2d28cb49c43eeaa4243df200fa22d387 Merge: 9492dbb 65c048e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 24 12:33:59 2014 -0500 Merge remote-tracking branch 'linus/prop220-nits' Conflicts: proposals/220-ecc-id-keys.txt proposals/220-ecc-id-keys.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --cc proposals/220-ecc-id-keys.txt index 153e0c9,cb8cf83..fef8beb --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@@ -236,9 -197,9 +236,9 @@@ Status: Draf option, to be set to "always-on" in the future once enough clients support it. -2.3.2. Extra-info documents +2.5.2. Extra-info documents - Extrainfo documents now include "identity-ed25519" and + Extra-info documents now include "identity-ed25519" and "router-signature-ed25519" fields in the same positions in which they appear in router descriptors.

1 0

[bridgedb/develop] Don't log emails if SAFE_LOGGING is enabled.
by isis＠torproject.org 24 Feb '14

24 Feb '14

commit 3a3fe60e159bfcb93f51cff861a0db794b867ad4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 22 00:15:23 2014 +0000 Don't log emails if SAFE_LOGGING is enabled. --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index c37713e..82a99ed 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -428,7 +428,7 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, mailbody.write(body) f.seek(0) - logging.debug("Email body:\n%s" % f.read()) + logging.debug("Email body:\n%s" % Util.logSafely(f.read())) f.seek(0) return clientAddr, f

1 0

[bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop
by isis＠torproject.org 24 Feb '14

24 Feb '14

commit 2b8b557c2bd3526029b2a09bb48ba95c9e20ff3e Merge: 3a3fe60 7e4a113 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 24 17:01:44 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Make the remoteip configurable during recaptcha verification
by isis＠torproject.org 24 Feb '14

24 Feb '14

commit 7e4a11343d19ee21b18189c41979251c452dc928 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 7 23:20:31 2014 +0000 Make the remoteip configurable during recaptcha verification Closes #10834 --- bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 9bf414a..d223875 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -223,6 +223,9 @@ RECAPTCHA_ENABLED = False RECAPTCHA_PUB_KEY = '' RECAPTCHA_PRIV_KEY = '' +# The remoteip we send to reCAPTCHA during verification +RECAPTCHA_REMOTEIP = '' + #------------------------------- # Email Distribution Options \ #------------------------------------------------------------------------------ diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 633d903..fb1fb7f 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -113,11 +113,13 @@ def replaceErrorPage(error, template_name=None): class CaptchaProtectedResource(twisted.web.resource.Resource): def __init__(self, useRecaptcha=False, recaptchaPrivKey='', - recaptchaPubKey='', useForwardedHeader=False, resource=None): + recaptchaPubKey='', remoteip='', useForwardedHeader=False, + resource=None): self.isLeaf = resource.isLeaf self.useForwardedHeader = useForwardedHeader self.recaptchaPrivKey = recaptchaPrivKey self.recaptchaPubKey = recaptchaPubKey + self.recaptchaRemoteIP = remoteip self.resource = resource def getClientIP(self, request): @@ -182,9 +184,12 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): except: return redirectTo(request.URLPath(), request) - # generate a random IP for the captcha submission - remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), - randint(1,255),randint(1,255)) + if self.recaptchaRemoteIP: + remote_ip = self.recaptchaRemoteIP + else: + # generate a random IP for the captcha submission + remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), + randint(1,255),randint(1,255)) recaptcha_response = captcha.submit(challenge, response, self.recaptchaPrivKey, remote_ip) @@ -464,6 +469,7 @@ def addWebServer(cfg, dist, sched): RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY RECAPTCHA_PRIV_KEY + RECAPTCHA_REMOTEIP dist -- an IPBasedDistributor object. sched -- an IntervalSchedule object. """ @@ -487,6 +493,7 @@ def addWebServer(cfg, dist, sched): protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, + remoteip=cfg.RECAPTCHA_REMOTEIP, useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, resource=resource) httpdist.putChild('bridges', protected)

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 896d88ba9ba359e4f93a3e8b2e4b790af11fba5d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 15:45:37 2014 +0000 Update translations for tor-launcher-network-settings_completed --- eu/network-settings.dtd | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index 7970c64..ffcc105 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -9,10 +9,10 @@ <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta, iragazita, edo proxyatuta dago."> -<!ENTITY torSettings.configurePrompt2 "Sare ezarpenak konfiguratu behar ditut."> +<!ENTITY torSettings.configurePrompt2 "Zubi, sueten, edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> -<!ENTITY torSettings.connectPrompt1 "Ordenagailu honen Interneteko konexioa oztopoz garbi dago."> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> +<!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> <!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxyren bat erabili behar al du?"> @@ -49,7 +49,11 @@ <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> -<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, agian zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen ari da.&#160; Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak direnak erabiliz lan egin dezakezu"> -<!ENTITY torsettings.bridgeHelp2 "Zubi errele batzuk eskuratzeko, erabili web nabigatzaile bat hurrengo orria bisitatzeko: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "Zubi publikoen helbideak aurkitzeko beste modu bat bridges(a)torproject.org-era mezu bat bidaltzea da, mezuaren gorputzean 'get bridges' esaldiarekin.&#160; Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu: gamil.com edo yahoo.com."> -<!ENTITY torsettings.bridgeHelp4 "Zubi erreleak eska ditzakezu help(a)rt.torproject.org-era mezu bat bidaliz ere."> +<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.&#160; Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> +<!ENTITY torsettings.bridgeHelp1B "Hemen dituzu zubi helbideak eskuratzeko hiru bide:"> +<!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> +<!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> +<!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> +<!ENTITY torsettings.bridgeHelp3 "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.&#160; Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu: gmail.com edo yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> +<!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.&#160; Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 8da35ab3615e9a0a51770bbeaace1fa39a0c5538 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 15:45:34 2014 +0000 Update translations for tor-launcher-network-settings --- eu/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index b200877..ffcc105 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "Zubi, sueten, edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> <!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxyren bat erabili behar al du?"> @@ -49,11 +49,11 @@ <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.&#160; Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> +<!ENTITY torsettings.bridgeHelp1B "Hemen dituzu zubi helbideak eskuratzeko hiru bide:"> +<!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> +<!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> +<!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> +<!ENTITY torsettings.bridgeHelp3 "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.&#160; Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu: gmail.com edo yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> +<!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.&#160; Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 4da5a2a8ca5474671b02a7d11a7c2558190576d5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 14:45:55 2014 +0000 Update translations for tails-iuk_completed --- fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa.po b/fa.po index 2f7d3a2..2f0111a 100644 --- a/fa.po +++ b/fa.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-02-21 17:38+0100\n" -"PO-Revision-Date: 2014-02-24 13:09+0000\n" +"PO-Revision-Date: 2014-02-24 14:26+0000\n" "Last-Translator: desmati <desmati(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0