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

[bridgedb/master] Scrub client information before logging
by asn＠torproject.org 09 Jul '13

09 Jul '13

commit c0ee0d54aaceb6aa0b955a2223e35a27b20e7e60 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Jul 9 01:33:59 2013 +0000 Scrub client information before logging --- lib/bridgedb/Dist.py | 16 +++++++++------- lib/bridgedb/EmailServer.py | 13 +++++++------ lib/bridgedb/HTTPServer.py | 9 +++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 4d7ee8e..8ca8a73 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -8,6 +8,7 @@ This module has functions to decide which bridges to hand out to whom. import bridgedb.Bridges import bridgedb.Storage +import bridgedb.Util as Util import logging import re @@ -131,14 +132,15 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): N -- the number of bridges to try to give back. """ if not bridgeFilterRules: bridgeFilterRules=[] - logging.debug("getBridgesForIP(%s, %s, %s, %s" % (ip, epoch, N, bridgeFilterRules)) + logging.debug("getBridgesForIP(%s, %s, %s, %s", + Util.logSafely(ip), epoch, N, bridgeFilterRules) if not len(self.splitter): logging.debug("bailing without splitter") return [] area = self.areaMapper(ip) - logging.info("area is %s" % area) + logging.info("area is %s", Util.logSafely(area)) key1 = '' pos = 0 @@ -154,8 +156,8 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s"%(epoch,area)) - pos = self.areaOrderHmac("category<%s>%s"%(epoch,area)) + logging.info("category<%s>%s", epoch, Util.logSafely(area)) + pos = self.areaOrderHmac("category<%s>%s", epoch, area) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, "Order-Bridges-In-Ring-%d"%n) break; @@ -364,15 +366,15 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: if wasWarned: logging.info("Got a request for bridges from %r; we already " - "sent a warning. Ignoring.", emailaddress) - raise IgnoreEmail("Client was warned", emailaddress) + "sent a warning. Ignoring.", Util.logSafely(emailaddress)) + raise IgnoreEmail("Client was warned", Util.logSafely(emailaddress)) else: db.setWarnedEmail(emailaddress, True, now) db.commit() logging.info("Got a request for bridges from %r; we already " "answered one within the last %d seconds. Warning.", - emailaddress, MAX_EMAIL_RATE) + Util.logSafely(emailaddress), MAX_EMAIL_RATE) raise TooSoonEmail("Too many emails; wait till later", emailaddress) # warning period is over diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index fc034c7..23fc8c1 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -25,6 +25,7 @@ import twisted.mail.smtp from zope.interface import implements import bridgedb.Dist +import bridgedb.Util as Util from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -99,11 +100,11 @@ def getMailResponse(lines, ctx): logging.info("Ignoring bad address on incoming email.") return None,None if not addrdomain: - logging.info("Couldn't parse domain from %r", clientAddr) + logging.info("Couldn't parse domain from %r", Util.logSafely(clientAddr)) if addrdomain and ctx.cfg.EMAIL_DOMAIN_MAP: addrdomain = ctx.cfg.EMAIL_DOMAIN_MAP.get(addrdomain, addrdomain) if addrdomain not in ctx.cfg.EMAIL_DOMAINS: - logging.info("Unrecognized email domain %r", addrdomain) + logging.info("Unrecognized email domain %r", Util.logSafely(addrdomain)) return None,None rules = ctx.cfg.EMAIL_DOMAIN_RULES.get(addrdomain, []) if 'dkim' in rules: @@ -176,7 +177,7 @@ def getMailResponse(lines, ctx): # Handle rate limited email except TooSoonEmail, e: logging.info("Got a mail too frequently; warning %r: %s.", - clientAddr, e) + Util.logSafely(clientAddr), e) # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours @@ -186,12 +187,12 @@ def getMailResponse(lines, ctx): except IgnoreEmail, e: logging.info("Got a mail too frequently; ignoring %r: %s.", - clientAddr, e) + Util.logSafely(clientAddr), e) return None, None except BadEmail, e: logging.info("Got a mail from a bad email address %r: %s.", - clientAddr, e) + Util.logSafely(clientAddr), e) return None, None if bridges: @@ -251,7 +252,7 @@ def replyToMail(lines, ctx): response, d) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) - logging.info("Sending reply to %r", sendToUser) + logging.info("Sending reply to %r", Util.logSafely(sendToUser)) return d def getLocaleFromPlusAddr(address): diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c181d63..6b469cc 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -22,6 +22,7 @@ from twisted.web.util import redirectTo import bridgedb.Dist import bridgedb.I18n as I18n +import bridgedb.Util as Util from recaptcha.client import captcha from bridgedb.Raptcha import Raptcha @@ -96,11 +97,11 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): self.recaptchaPrivKey, remote_ip) if recaptcha_response.is_valid: logging.info("Valid recaptcha from %s. Parameters were %r", - remote_ip, request.args) + Util.logSafely(remote_ip), request.args) return self.resource.render(request) else: logging.info("Invalid recaptcha from %s. Parameters were %r", - remote_ip, request.args) + Util.logSafely(remote_ip), request.args) logging.info("Recaptcha error code: %s", recaptcha_response.error_code) return redirectTo(request.URLPath(), request) @@ -209,8 +210,8 @@ class WebResource(twisted.web.resource.Resource): request=bridgedb.Dist.uniformMap(ip) ) for b in bridges) - logging.info("Replying to web request from %s. Parameters were %r", ip, - request.args) + logging.info("Replying to web request from %s. Parameters were %r", + Util.logSafely(ip), request.args) if format == 'plain': request.setHeader("Content-Type", "text/plain") return answer

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 09 Jul '13

09 Jul '13

commit b7d1717a7973e12b1c2c7de8a1871baf1682d362 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 9 07:46:30 2013 +0000 Update translations for tor-launcher-network-settings --- th/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/th/network-settings.dtd b/th/network-settings.dtd index 7cbea98..89884fa 100644 --- a/th/network-settings.dtd +++ b/th/network-settings.dtd @@ -9,13 +9,13 @@ <!ENTITY torSettings.firstQuestion ""> <!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> +<!ENTITY torSettings.configurePrompt2 "ฉันต้องการปรับแต่งค่าติดตั้งเครือข่าย"> <!ENTITY torSettings.configure "ปรับแต่ง"> -<!ENTITY torSettings.connectPrompt1 ""> +<!ENTITY torSettings.connectPrompt1 "การเชื่อมต่ออินเทอร์เน็ตของคอมพิวเตอร์เครื่องนี้ปราศจากอุปสรรค"> <!ENTITY torSettings.connectPrompt2 "ฉันอยากจะเชื่อมต่อโดยตรงกับเครือข่าย Tor"> <!ENTITY torSettings.connect "เชื่อมต่อ"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "คอมพิวเตอร์เครื่องนี้จำเป็นต้องใช้พร็อกซีเพื่อเข้าถึงอินเทอร์เน็ตหรือไม่?">  <!ENTITY torSettings.proxyHelp ""> <!ENTITY torSettings.enterProxy "ใส่ค่าติดตั้งพร็อกซี"> @@ -42,7 +42,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาต:"> -<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.useBridges.checkbox "ผู้ให้บริการอินเทอร์เน็ต (ไอเอสพี) ของฉัน ปิดกั้นการเชื่อมต่อกับเครือข่าย Tor"> <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder "address:port">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 09 Jul '13

09 Jul '13

commit 1137a07bec8c0c4622bae27558a90868de05f9c7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 9 07:16:28 2013 +0000 Update translations for tor-launcher-properties --- th/torlauncher.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/th/torlauncher.properties b/th/torlauncher.properties index 129781a..684c3d8 100644 --- a/th/torlauncher.properties +++ b/th/torlauncher.properties @@ -3,20 +3,20 @@ # torlauncher.error_title=Tor Launcher -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไม่คาดคิด +torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้ +torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว +torlauncher.tor_bootstrap_failed=Tor ล้มเหลวในการสร้างการเชื่อมต่อกับเครือข่าย Tor\n\n%S -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=ไม่สามารถเริ่มการทำงานของ Tor ได้\n\n%S +torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป +torlauncher.torrc_missing=แฟ้ม torrc หายไป +torlauncher.datadir_missing=ไม่มีไดเรกทอรีข้อมูลของ Tor +torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=ไม่สามารถเรียกการตั้งค่า Tor ได้\n\n%S +torlauncher.failed_to_save_settings=ไม่สามารถบันทึกการตั้งค่า Tor ได้\n\n%S +torlauncher.ensure_tor_is_running=กรุณาตรวจให้แน่ใจว่า Tor กำลังทำงานอยู่ torlauncher.error_proxy_addr_missing=คุณต้องระบุทั้งที่อยู่ IP หรือชื่อเครื่อง และหมายเลขพอร์ต เพื่อปรับแต่ง Tor ให้ใช้พร็อกซีในการเชื่อมต่ออินเทอร์เน็ต torlauncher.error_proxy_type_missing=คุณต้องเลือกชนิดพร็อกซี

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 09 Jul '13

09 Jul '13

commit 286cab6f6029e4ba081cd138cef8d10b8146e771 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 9 07:16:05 2013 +0000 Update translations for whisperback_completed --- th/th.po | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/th/th.po b/th/th.po new file mode 100644 index 0000000..6dab77e --- /dev/null +++ b/th/th.po @@ -0,0 +1,200 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# bact' â <arthit(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-26 15:50+0100\n" +"PO-Revision-Date: 2013-07-09 07:10+0000\n" +"Last-Translator: bact' â <arthit(a)gmail.com>\n" +"Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: th\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "àžàžµà¹àž¡àž¥àžàžŽàžàžà¹àžà¹àž¡à¹àžàž¹àžàžà¹àžàž: %s" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "àžàžžàžà¹àž OpenPGP àžàžàžàžàžµà¹àžàžŽàžàžà¹àžà¹àž¡à¹àžàž¹àžàžà¹àžàž: %s" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "àžàž¥à¹àžàžàžàžžàžà¹àž OpenPGP àžàžàžàžàžµà¹àžàžŽàžàžà¹àžà¹àž¡à¹àžàž¹àžàžà¹àžàž" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "à¹àž¡à¹àžàžàžàž±àž§à¹àžàž£àž° %s à¹àžà¹àžà¹àž¡àžàž±à¹àžàžà¹àž²à¹àžà¹ /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" + +#: ../whisperBack/gui.py:151 +msgid "Unable to load a valid configuration." +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžà¹àžà¹àž¡àžàž±à¹àžàžà¹àž²àžàžµà¹àžàž¹àžàžà¹àžàžà¹àžà¹" + +#: ../whisperBack/gui.py:217 +msgid "Sending mail..." +msgstr "àžàž³àž¥àž±àžàžªà¹àžàžàžµà¹àž¡àž¥..." + +#: ../whisperBack/gui.py:218 +msgid "Sending mail" +msgstr "àžàž³àž¥àž±àžàžªà¹àžàžàžµà¹àž¡àž¥" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:220 +msgid "This could take a while..." +msgstr "àžàžµà¹àžàž²àžà¹àžà¹à¹àž§àž¥àž²àžªàž±àžàžàž±àž..." + +#: ../whisperBack/gui.py:234 +msgid "The contact email adress doesn't seem valid." +msgstr "àžàžµà¹àžàž¢àž¹à¹àžàžµà¹àž¡àž¥àžàžŽàžàžà¹àžàžàž¹à¹àž«àž¡àž·àžàžàžàž°à¹àžà¹à¹àž¡à¹à¹àžà¹" + +#: ../whisperBack/gui.py:251 +msgid "Unable to send the mail: SMTP error." +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàžàžµà¹àž¡àž¥à¹àžà¹: àžà¹àžàžàžŽàžàžàž¥àž²àž SMTP" + +#: ../whisperBack/gui.py:253 +msgid "Unable to connect to the server." +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àžàž·à¹àžàž¡àžà¹àžà¹àžàž¢àž±àžà¹àžàžŽàž£à¹àžà¹àž§àžàž£à¹à¹àžà¹" + +#: ../whisperBack/gui.py:255 +msgid "Unable to create or to send the mail." +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªàž£à¹àž²àžàž«àž£àž·àžàžªà¹àžàžàžµà¹àž¡àž¥à¹àžà¹" + +#: ../whisperBack/gui.py:258 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "\n\nà¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹ à¹àžà¹àžà¹àžà¹àžà¹àž§à¹àž²à¹àžàž·à¹àžàžàžàž²àžàžàž±àžàž«àž²à¹àžàž£àž·àžàžà¹àž²àž¢ à¹àžàž£àžàž¥àžàžà¹àžàž·à¹àžàž¡àžà¹àžàžàž±àžà¹àžàž£àž·àžàžà¹àž²àž¢à¹àž«àž¡à¹ à¹àž¥àž°àžàž¥àžŽàžàžªà¹àžàžàžµàžàžàž£àž±à¹àž\n\nàžà¹àž²àž¡àž±àžà¹àž¡à¹à¹àžà¹ àžàžžàžàžàž°àžàž¹àžàžàž²àž¡à¹àž«à¹àžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžàžàž±àžàžàž¥à¹àž²àž§" + +#: ../whisperBack/gui.py:271 +msgid "Your message has been sent." +msgstr "àžà¹àžàžàž§àž²àž¡àžàžàžàžàžžàžàžàž¹àžàžªà¹àžà¹àž¥à¹àž§" + +#: ../whisperBack/gui.py:278 +msgid "An error occured during encryption." +msgstr "à¹àžàžŽàžàžà¹àžàžàžŽàžàžàž¥àž²àžàž£àž°àž«àž§à¹àž²àžàžàž²àž£à¹àžà¹àž²àž£àž«àž±àžª" + +#: ../whisperBack/gui.py:298 +#, python-format +msgid "Unable to save %s." +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžàž±àžàžàž¶àž %s" + +#. XXX: fix string +#: ../whisperBack/gui.py:322 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹ à¹àžà¹àžà¹àžà¹àžà¹àž§à¹àž²à¹àžàž·à¹àžàžàžàž²àžàžàž±àžàž«àž²à¹àžàž£àž·àžàžà¹àž²àž¢\n\nà¹àžàž·à¹àžà¹àž«à¹àžàž³àžàž²àžà¹àžàžà¹àžàžà¹àžà¹ àžàžžàžàžªàž²àž¡àž²àž£àžàžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹àžà¹àžà¹àž¡àžàžà¹àžàž£àžà¹àž¢àž¹à¹àžàžªàžàžµ à¹àž¥àž°àž¥àžàžàžªà¹àžàž¡àž±àžàž«àž²à¹àž£àž²àžàžµà¹ %s àžàž²àžàžàž±àžàžàžµàžàžµà¹àž¡àž¥àžàžàžàžàžžàž à¹àžàž¢à¹àžà¹àž£àž°àžàžàžàž·à¹àž à¹àžàž£àžàžàž³àž§à¹àž² àž£àž²àž¢àžàž²àžàžàž±à¹àžàžàžàžàžàžžàžàžàž°à¹àž¡à¹àžàž¹àžàžàžŽàžàžàž·à¹àžàžà¹àž²àžàžžàžàžàž³à¹àžà¹àžàžàž±à¹àž à¹àž§à¹àžà¹àžªàžµàž¢à¹àžà¹àž§à¹àž²àžàžžàžàžàž°à¹àžà¹àž¡àž²àžàž£àžàž²àž£à¹àžàžŽà¹àž¡à¹àžàžŽàž¡àžà¹àž§àž¢àžàž±àž§àžàžžàžà¹àžàž (à¹àžà¹àž à¹àžà¹ Tor àžà¹àž§àž¢àžàž±àžàžàžµàžàžµà¹àž¡àž¥à¹àžàžà¹àžà¹àžàž£àž±à¹àžà¹ àžàžµàž¢àž§àžàžŽà¹àž)\n\nàžàžžàžàžà¹àžàžàžàž²àž£àžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžàž¥àžà¹àžà¹àž¡àž«àž£àž·àžà¹àž¡à¹?" + +#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +msgid "WhisperBack" +msgstr "WhisperBack" + +#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 +msgid "Send feedback in an encrypted mail." +msgstr "àžªà¹àžàžàž³àžàžŽàžàž¡à¹àžàžàžµà¹àž¡àž¥à¹àžà¹àž²àž£àž«àž±àžª" + +#: ../whisperBack/gui.py:390 +msgid "Copyright Â© 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "àž¥àžŽàžàžªàžŽàžàžàžŽà¹ Â© 2009-2012 àžàž±àžàžàž±àžàžàž² Tails (tails(a)boum.org)" + +#: ../whisperBack/gui.py:391 +msgid "Tails developers <tails(a)boum.org>" +msgstr "àžàž±àžàžàž±àžàžàž² Tails <tails(a)boum.org>" + +#: ../whisperBack/gui.py:392 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../whisperBack/gui.py:419 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "àžàžµà¹à¹àž¡à¹àžà¹àž²àžàž°à¹àžà¹àž URL àž«àž£àž·àžàžàžžàžà¹àž OpenPGP àžàžµà¹àžàž¹àžàžà¹àžàž" + +#: ../data/whisperback.ui.h:1 +msgid "Copyright Â© 2009-2012 tails(a)boum.org" +msgstr "àž¥àžŽàžàžªàžŽàžàžàžŽà¹ Â© 2009-2012 tails(a)boum.org" + +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" + +#: ../data/whisperback.ui.h:4 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - àžªà¹àžàžà¹àžàž¡àž¹àž¥àžàžŽàžàž¡àžàž¥àž±àžàžàž²àžàžàžµà¹àž¡àž¥à¹àžà¹àž²àž£àž«àž±àžª\nàž¥àžŽàžàžªàžŽàžàžàžŽà¹ (C) 2009-2012 àžàž¹à¹àžàž±àžàžàž² Tails <tails(a)boum.org>\n\nà¹àžàž£à¹àžàž£àž¡àžàžµà¹à¹àžà¹àžàžàžàžàžà¹à¹àž§àž£à¹à¹àžªàž£àžµ; àžàžžàžàžªàž²àž¡àž²àž£àžàžàž³àž«àžà¹àž²àž¢àžà¹àž²àž¢à¹àžàžàž¡àž±àž à¹àž¥àž°/àž«àž£àž·àž à¹àžà¹à¹àž\nàž¡àž±àžàž àž²àž¢à¹àžà¹à¹àžàž·à¹àžàžà¹àžàžàžàžàžªàž±àžàžàž²àžàžàžžàžàž²àžàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹ (GNU General\nPublic License) àžàž²àž¡àžàžµà¹à¹àžàž¢à¹àžàž£à¹à¹àžàž¢àž¡àž¹àž¥àžàžŽàžàžŽàžàžàžàžà¹à¹àž§àž£à¹à¹àžªàž£àžµ (Free Software\nFoundation); àžàž¶à¹àžàžàž°à¹àžà¹àž£àžžà¹àžàžàžµà¹ 3 àžàžàžàžªàž±àžàžàž²àžàž±àžàžàž¥à¹àž²àž§ àž«àž£àž·àžàž£àžžà¹àžàž«àž¥àž±àžàžàž²àžàžàž±à¹àžàžà¹à¹àžà¹\n(àžàž¢àž¹à¹àžàžµà¹àžàžžàžà¹àž¥àž·àžàž)\n\nà¹àžàž£à¹àžàž£àž¡àžàžµà¹àžàž ¹àžàžàž³àž«àžà¹àž²àž¢àžà¹àž²àž¢à¹àžàž àžà¹àž§àž¢àž«àž§àž±àžàž§à¹àž²àž¡àž±àžàžàž°àž¡àžµàžàž£àž°à¹àž¢àžàžà¹ à¹àžà¹àž¡àž±àžà¹àž¡à¹àž¡àžµàžàž²àž£àž£àž±àžàžàž£àž°àžàž±àžà¹àžà¹\nà¹àž¡à¹àž¡àžµà¹àž¡à¹à¹àžà¹àžàž²àž£àž£àž±àžàžàž£àž°àžàž±àžà¹àžàž¢àžàž±àž¢àžàž¶àžàžàž§àž²àž¡àžªàž²àž¡àž²àž£àžà¹àžàžàž²àž£àžàž³à¹àžàžàž³àžàž²àž£àžà¹àž²à¹àžà¹\nàž«àž£àž·àž àžàž§àž²àž¡à¹àž«àž¡àž²àž°àžªàž¡àžªàž³àž«àž£àž±àžàžàžžàžàžàž£àž°àžªàžàžà¹à¹àžàžàžžàžàžàž£àž°àžªàžàžà¹àž«àžàž¶à¹àž àžàž¹àžªàž±àžàžàž²àžàžàžžàžàž²àž\nàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹àžªàž³àž«àž£àž±àžàž£àž²àž¢àž¥àž°à¹àžàžµàž¢àžà¹àžàžŽà¹àž¡à¹àžàžŽàž¡\n\nàžàžžàžàžàž§àž£à¹àžà¹àž£àž±àžàžªàž³à¹àžàž²àžàžàžàžªàž±àžàžàž²àžàžàžžàžàž²àžàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹\nàž¡àž²àžàž£à¹àžàž¡àžàž±àžà¹àžàž£à¹àžàž£àž¡àžàžµà¹ àžà¹àž²à¹àž¡à¹àžàž àžàž¹ <http://www.gnu.org/licenses/>\n" + +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "àžà¹àž²àžàžžàžàžà¹àžàžàžàž²àž£à¹àž«à¹à¹àž£àž²à¹àžà¹àž²àž£àž«àž±àžªàžà¹àžàžàž§àž²àž¡à¹àž¡àž·à¹àžà¹àž£àž²àžàžàžàžàž¥àž±àžàžàžžàž à¹àžàžŽà¹àž¡ ID àžàžàžàžàžžàžà¹àžàžàžžàž àž¥àžŽàžàžà¹à¹àžàž«àž²àžàžžàžà¹àžàžàžžàž àž«àž£àž·àžàžàžžàžà¹àžàžàž±àžàžàž¥à¹àž²àž§à¹àžàž£àž¹àžà¹àžàžàžàž¥à¹àžàžàžàžžàžà¹àžàžªàž²àžàž²àž£àžàž°" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "àžªàž£àžžàž" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "àž£àž²àž¢àž¥àž°à¹àžàžµàž¢àžàžàž±àž" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "àžàžµà¹àžàž¢àž¹à¹àžàžµà¹àž¡àž¥àžàž²àžà¹àž¥àž·àžàžàžªàž³àž«àž£àž±àžàžàžŽàžàžà¹àžàžàžžàž" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "àžàžžàžà¹àž PGP àžàž±àž§à¹àž¥àž·àžàž" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "àž£àž²àž¢àž¥àž°à¹àžàžµàž¢àžàžàž²àžà¹àžàžàžàžŽàžàžàžµà¹àžàž°àž£àž§àž¡à¹àžàžà¹àž§àž¢" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "àžªà¹àž§àžàž«àž±àž§" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "àžà¹àžàž¡àž¹àž¥àžàžµàžàž±àž" + +#: ../data/whisperback.ui.h:29 +msgid "Help" +msgstr "àžà¹àž§àž¢à¹àž«àž¥àž·àž" + +#: ../data/whisperback.ui.h:30 +msgid "Send" +msgstr "àžªà¹àž"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 09 Jul '13

09 Jul '13

commit 9f06d1f23d993b07bd6e950a091ccb06081c67cb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 9 07:16:02 2013 +0000 Update translations for whisperback --- th/th.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/th/th.po b/th/th.po index 58f9b4e..6dab77e 100644 --- a/th/th.po +++ b/th/th.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-07-09 06:44+0000\n" +"PO-Revision-Date: 2013-07-09 07:10+0000\n" "Last-Translator: bact' â <arthit(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "àžàž¥à¹àžàžàžàžžàžà¹àž OpenPGP àžàžàžàžàžµà¹àžàžŽàžàžà¹ msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "à¹àž¡à¹àžàžàžàž±àž§à¹àžàž£àž° %s à¹àžà¹àžà¹àž¡àžàž±à¹àžàžà¹àž²à¹àžà¹ /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." @@ -80,7 +80,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n\nà¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹ à¹àžà¹àžà¹àžà¹àžà¹àž§à¹àž²à¹àžàž·à¹àžàžàžàž²àžàžàž±àžàž«àž²à¹àžàž£àž·àžàžà¹àž²àž¢ à¹àžàž£àžàž¥àžàžà¹àžàž·à¹àžàž¡àžà¹àžàžàž±àžà¹àžàž£àž·àžàžà¹àž²àž¢à¹àž«àž¡à¹ à¹àž¥àž°àžàž¥àžŽàžàžªà¹àžàžàžµàžàžàž£àž±à¹àž\n\nàžà¹àž²àž¡àž±àžà¹àž¡à¹à¹àžà¹ àžàžžàžàžàž°àžàž¹àžàžàž²àž¡à¹àž«à¹àžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžàžàž±àžàžàž¥à¹àž²àž§" #: ../whisperBack/gui.py:271 msgid "Your message has been sent." @@ -104,7 +104,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "" +msgstr "à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹ à¹àžà¹àžà¹àžà¹àžà¹àž§à¹àž²à¹àžàž·à¹àžàžàžàž²àžàžàž±àžàž«àž²à¹àžàž£àž·àžàžà¹àž²àž¢\n\nà¹àžàž·à¹àžà¹àž«à¹àžàž³àžàž²àžà¹àžàžà¹àžàžà¹àžà¹ àžàžžàžàžªàž²àž¡àž²àž£àžàžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžà¹àžà¹àžà¹àžà¹àž¡àžàžà¹àžàž£àžà¹àž¢àž¹à¹àžàžªàžàžµ à¹àž¥àž°àž¥àžàžàžªà¹àžàž¡àž±àžàž«àž²à¹àž£àž²àžàžµà¹ %s àžàž²àžàžàž±àžàžàžµàžàžµà¹àž¡àž¥àžàžàžàžàžžàž à¹àžàž¢à¹àžà¹àž£àž°àžàžàžàž·à¹àž à¹àžàž£àžàžàž³àž§à¹àž² àž£àž²àž¢àžàž²àžàžàž±à¹àžàžàžàžàžàžžàžàžàž°à¹àž¡à¹àžàž¹àžàžàžŽàžàžàž·à¹àžàžà¹àž²àžàžžàžàžàž³à¹àžà¹àžàžàž±à¹àž à¹àž§à¹àžà¹àžªàžµàž¢à¹àžà¹àž§à¹àž²àžàžžàžàžàž°à¹àžà¹àž¡àž²àžàž£àžàž²àž£à¹àžàžŽà¹àž¡à¹àžàžŽàž¡àžà¹àž§àž¢àžàž±àž§àžàžžàžà¹àžàž (à¹àžà¹àž à¹àžà¹ Tor àžà¹àž§àž¢àžàž±àžàžàžµàžàžµà¹àž¡àž¥à¹àžàžà¹àžà¹àžàž£àž±à¹àžà¹ àžàžµàž¢àž§àžàžŽà¹àž)\n\nàžàžžàžàžà¹àžàžàžàž²àž£àžàž±àžàžàž¶àžàž£àž²àž¢àžàž²àžàžàž±à¹àžàž¥àžà¹àžà¹àž¡àž«àž£àž·àžà¹àž¡à¹?" #: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -124,7 +124,7 @@ msgstr "àžàž±àžàžàž±àžàžàž² Tails <tails(a)boum.org>" #: ../whisperBack/gui.py:392 msgid "translator-credits" -msgstr "" +msgstr "translator-credits" #: ../whisperBack/gui.py:419 msgid "This doesn't seem to be a valid URL or OpenPGP key." @@ -155,13 +155,13 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - àžªà¹àžàžà¹àžàž¡àž¹àž¥àžàžŽàžàž¡àžàž¥àž±àžàžàž²àžàžàžµà¹àž¡àž¥à¹àžà¹àž²àž£àž«àž±àžª\nàž¥àžŽàžàžªàžŽàžàžàžŽà¹ (C) 2009-2012 àžàž¹à¹àžàž±àžàžàž² Tails <tails(a)boum.org>\n\nà¹àžàž£à¹àžàž£àž¡àžàžµà¹à¹àžà¹àžàžàžàžàžà¹à¹àž§àž£à¹à¹àžªàž£àžµ; àžàžžàžàžªàž²àž¡àž²àž£àžàžàž³àž«àžà¹àž²àž¢àžà¹àž²àž¢à¹àžàžàž¡àž±àž à¹àž¥àž°/àž«àž£àž·àž à¹àžà¹à¹àž\nàž¡àž±àžàž àž²àž¢à¹àžà¹à¹àžàž·à¹àžàžà¹àžàžàžàžàžªàž±àžàžàž²àžàžàžžàžàž²àžàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹ (GNU General\nPublic License) àžàž²àž¡àžàžµà¹à¹àžàž¢à¹àžàž£à¹à¹àžàž¢àž¡àž¹àž¥àžàžŽàžàžŽàžàžàžàžà¹à¹àž§àž£à¹à¹àžªàž£àžµ (Free Software\nFoundation); àžàž¶à¹àžàžàž°à¹àžà¹àž£àžžà¹àžàžàžµà¹ 3 àžàžàžàžªàž±àžàžàž²àžàž±àžàžàž¥à¹àž²àž§ àž«àž£àž·àžàž£àžžà¹àžàž«àž¥àž±àžàžàž²àžàžàž±à¹àžàžà¹à¹àžà¹\n(àžàž¢àž¹à¹àžàžµà¹àžàžžàžà¹àž¥àž·àžàž)\n\nà¹àžàž£à¹àžàž£àž¡àžàžµà¹àžàž ¹àžàžàž³àž«àžà¹àž²àž¢àžà¹àž²àž¢à¹àžàž àžà¹àž§àž¢àž«àž§àž±àžàž§à¹àž²àž¡àž±àžàžàž°àž¡àžµàžàž£àž°à¹àž¢àžàžà¹ à¹àžà¹àž¡àž±àžà¹àž¡à¹àž¡àžµàžàž²àž£àž£àž±àžàžàž£àž°àžàž±àžà¹àžà¹\nà¹àž¡à¹àž¡àžµà¹àž¡à¹à¹àžà¹àžàž²àž£àž£àž±àžàžàž£àž°àžàž±àžà¹àžàž¢àžàž±àž¢àžàž¶àžàžàž§àž²àž¡àžªàž²àž¡àž²àž£àžà¹àžàžàž²àž£àžàž³à¹àžàžàž³àžàž²àž£àžà¹àž²à¹àžà¹\nàž«àž£àž·àž àžàž§àž²àž¡à¹àž«àž¡àž²àž°àžªàž¡àžªàž³àž«àž£àž±àžàžàžžàžàžàž£àž°àžªàžàžà¹à¹àžàžàžžàžàžàž£àž°àžªàžàžà¹àž«àžàž¶à¹àž àžàž¹àžªàž±àžàžàž²àžàžàžžàžàž²àž\nàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹àžªàž³àž«àž£àž±àžàž£àž²àž¢àž¥àž°à¹àžàžµàž¢àžà¹àžàžŽà¹àž¡à¹àžàžŽàž¡\n\nàžàžžàžàžàž§àž£à¹àžà¹àž£àž±àžàžªàž³à¹àžàž²àžàžàžàžªàž±àžàžàž²àžàžàžžàžàž²àžàžªàž²àžàž²àž£àžàž°àžàž±à¹àž§à¹àžàžàžàžàžàžàž¹\nàž¡àž²àžàž£à¹àžàž¡àžàž±àžà¹àžàž£à¹àžàž£àž¡àžàžµà¹ àžà¹àž²à¹àž¡à¹àžàž àžàž¹ <http://www.gnu.org/licenses/>\n" #: ../data/whisperback.ui.h:20 msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "" +msgstr "àžà¹àž²àžàžžàžàžà¹àžàžàžàž²àž£à¹àž«à¹à¹àž£àž²à¹àžà¹àž²àž£àž«àž±àžªàžà¹àžàžàž§àž²àž¡à¹àž¡àž·à¹àžà¹àž£àž²àžàžàžàžàž¥àž±àžàžàžžàž à¹àžàžŽà¹àž¡ ID àžàžàžàžàžžàžà¹àžàžàžžàž àž¥àžŽàžàžà¹à¹àžàž«àž²àžàžžàžà¹àžàžàžžàž àž«àž£àž·àžàžàžžàžà¹àžàžàž±àžàžàž¥à¹àž²àž§à¹àžàž£àž¹àžà¹àžàžàžàž¥à¹àžàžàžàžžàžà¹àžàžªàž²àžàž²àž£àžàž°" #: ../data/whisperback.ui.h:22 msgid "Summary"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 09 Jul '13

09 Jul '13

commit 8e332dc78a2659ccf5d91c1799c9999bc5b7f8e7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 9 06:46:01 2013 +0000 Update translations for whisperback --- th/th.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/th/th.po b/th/th.po index 708fddb..58f9b4e 100644 --- a/th/th.po +++ b/th/th.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-07-08 03:40+0000\n" +"PO-Revision-Date: 2013-07-09 06:44+0000\n" "Last-Translator: bact' ☂ <arthit(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -84,7 +84,7 @@ msgstr "" #: ../whisperBack/gui.py:271 msgid "Your message has been sent." -msgstr "" +msgstr "ข้อความของคุณถูกส่งแล้ว" #: ../whisperBack/gui.py:278 msgid "An error occured during encryption." @@ -173,7 +173,7 @@ msgstr "รายละเอียดบัก" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "" +msgstr "ที่อยู่อีเมลทางเลือกสำหรับติดต่อคุณ" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" @@ -181,7 +181,7 @@ msgstr "กุญแจ PGP ตัวเลือก" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "" +msgstr "รายละเอียดทางเทคนิคที่จะรวมไปด้วย" #: ../data/whisperback.ui.h:27 msgid "headers"

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 09 Jul '13

09 Jul '13

commit ee24c18f1366a3afa2c8642441ca42bb3c1f8c3b Merge: b5188b2 240ba48 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 8 22:13:29 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.4] bump recommended-versions
by erinn＠torproject.org 09 Jul '13

09 Jul '13

commit 240ba487a34c43d4031d5b861bc9e984b308fc32 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 8 22:13:06 2013 -0300 bump recommended-versions --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f358365..faa7563 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,9 +3,9 @@ "2.3.25-10-Windows", "2.3.25-10-Linux", "2.3.25-10-Linux", -"2.4.14-alpha-1-MacOS", -"2.4.14-alpha-1-Windows", -"2.4.14-alpha-1-Linux", +"2.4.15-beta-1-MacOS", +"2.4.15-beta-1-Windows", +"2.4.15-beta-1-Linux", "3.0-alpha-2-Linux", "3.0-alpha-2-MacOS", "3.0-alpha-2-Windows"

1 0

[torbrowser/master] bump recommended-versions
by erinn＠torproject.org 09 Jul '13

09 Jul '13

commit 240ba487a34c43d4031d5b861bc9e984b308fc32 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 8 22:13:06 2013 -0300 bump recommended-versions --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f358365..faa7563 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,9 +3,9 @@ "2.3.25-10-Windows", "2.3.25-10-Linux", "2.3.25-10-Linux", -"2.4.14-alpha-1-MacOS", -"2.4.14-alpha-1-Windows", -"2.4.14-alpha-1-Linux", +"2.4.15-beta-1-MacOS", +"2.4.15-beta-1-Windows", +"2.4.15-beta-1-Linux", "3.0-alpha-2-Linux", "3.0-alpha-2-MacOS", "3.0-alpha-2-Windows"

1 0

r26246: {website} update packages for tor 0.2.4.15-rc (website/trunk/include)
by Erinn Clark 09 Jul '13

09 Jul '13

Author: erinn Date: 2013-07-09 00:42:24 +0000 (Tue, 09 Jul 2013) New Revision: 26246 Modified: website/trunk/include/versions.wmi Log: update packages for tor 0.2.4.15-rc Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-07-08 00:23:40 UTC (rev 26245) +++ website/trunk/include/versions.wmi 2013-07-09 00:42:24 UTC (rev 26246) @@ -2,26 +2,26 @@ <define-tag version-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.15-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.15-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.15-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.15-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.14-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.15-rc</define-tag> <define-tag version-torbrowserbundle whitespace=delete>2.3.25-10</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> @@ -32,7 +32,7 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.14-alpha-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.15-beta-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-10</define-tag> @@ -42,8 +42,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.14-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.14-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.15-beta-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.15-beta-1</define-tag> <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> @@ -53,8 +53,8 @@ <define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.14-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.14-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.15-beta-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.15-beta-1</define-tag> <define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag>

1 0