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

[flashproxy/master] Remove unused function.
by dcf＠torproject.org 30 Jun '13

30 Jun '13

commit 2f4f4c3d5c5910725837d3aa4c23ac30bb95ffdc Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 29 16:18:18 2013 -0700 Remove unused function. Now handled by facilitator-reg-daemon. --- facilitator/facilitator-email-poller | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 2e6bd4a..614cdc9 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -207,17 +207,6 @@ if options.privdrop_username is not None: if options.imaplib_debug: imaplib.Debug = 4 -def find_client_addr(body): - """Find and parse the first client line of the form - client=... - Returns None if no client line was found. - """ - for line in body.splitlines(): - if line.startswith("client="): - _, client_spec = line.split("=", 1) - return fac.parse_addr_spec(client_spec) - return None - def handle_message(msg): try: if fac.put_reg_base64(msg.get_payload()):

1 0

[flashproxy/master] Don't process email registrations older than 30 minutes old.
by dcf＠torproject.org 30 Jun '13

30 Jun '13

commit 2721c1e44997020be3d3e405dc252cc20c08487e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 29 17:14:40 2013 -0700 Don't process email registrations older than 30 minutes old. Based on a patch by Sukhbir. See #8285. --- ChangeLog | 6 +++++ facilitator/facilitator-email-poller | 42 +++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index edd92a0..29d4bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,12 @@ "client" and "relay" parameters. It serves the one given client and then stops. Patch by Arlo Breault. Fixes bug 9006. + o facilitator-email-poller ignores messages received a long time ago. + This is to fix the situation where facilitator-email-poller stops + running for some reason, comes back after some hours, and then + flushes a lot of no-longer-relevant registrations out to proxies. + Patch by Sukhbir Singh and David Fifield. Fixes bug 8285. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 614cdc9..f520033 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -1,6 +1,9 @@ #!/usr/bin/env python +import calendar +import datetime import email +import email.utils import getopt import imaplib import math @@ -24,6 +27,9 @@ DEFAULT_EMAIL_ADDRESS = "flashproxyreg.a(a)gmail.com" DEFAULT_LOG_FILENAME = "facilitator-email-poller.log" POLL_INTERVAL = 60 +# Ignore message older than this many seconds old, or newer than this many +# seconds in the future. +REGISTRATION_AGE_LIMIT = 30 * 60 FACILITATOR_ADDR = ("127.0.0.1", 9002) @@ -207,6 +213,39 @@ if options.privdrop_username is not None: if options.imaplib_debug: imaplib.Debug = 4 +def message_get_date(msg): + """Get the datetime when the message was received by reading the X-Received + header, relative to UTC. Returns None on error.""" + x_received = msg["X-Received"] + if x_received is None: + log(u"X-Received is missing") + return None + try: + _, date_str = x_received.rsplit(";", 1) + date_str = date_str.strip() + except ValueError: + log(u"can't parse X-Received %s" % repr(x_received)) + return None + date_tuple = email.utils.parsedate_tz(date_str) + if date_tuple is None: + log(u"can't parse X-Received date string %s" % repr(date_str)) + return None + timestamp_utc = calendar.timegm(date_tuple[:8] + (0,)) - date_tuple[9] + return datetime.datetime.utcfromtimestamp(timestamp_utc) + +def message_ok(msg): + date = message_get_date(msg) + if date is not None: + now = datetime.datetime.utcnow() + age = time.mktime(now.utctimetuple()) - time.mktime(date.utctimetuple()) + if age > REGISTRATION_AGE_LIMIT: + log(u"message dated %s UTC is too old: %d seconds" % (date, age)) + return False + if -age > REGISTRATION_AGE_LIMIT: + log(u"message dated %s UTC is from the future: %d seconds" % (date, -age)) + return False + return True + def handle_message(msg): try: if fac.put_reg_base64(msg.get_payload()): @@ -279,7 +318,8 @@ def imap_loop(imap): try: msg = email.message_from_string(msg_text) - handle_message(msg) + if message_ok(msg): + handle_message(msg) except Exception, e: log("Error processing message, deleting anyway: %s" % str(e))

1 0

[tor-browser-bundle/master] Make a deterministic tar wrapper and improve the zip wrappers.
by mikeperry＠torproject.org 30 Jun '13

30 Jun '13

commit 0577db3360a23ad4d8c518c1804110a446fbcb9f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Jun 29 17:23:47 2013 -0700 Make a deterministic tar wrapper and improve the zip wrappers. Resulting file permissions inside the archive seem to vary arbitrarily between build machines, even though we set umask. What's up with that? --- gitian/build-helpers/dtar.sh | 11 +++++++++++ gitian/build-helpers/dzip.sh | 3 +++ gitian/build-helpers/re-dzip.sh | 4 ++-- gitian/descriptors/linux/gitian-bundle.yml | 13 +++++-------- gitian/descriptors/mac/gitian-bundle.yml | 8 ++------ gitian/descriptors/windows/gitian-bundle.yml | 8 ++------ 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh new file mode 100755 index 0000000..bc2d89c --- /dev/null +++ b/gitian/build-helpers/dtar.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Crappy deterministic tar wrapper +export LC_ALL=C + +TARFILE=$1 +shift + +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + +tar --no-recursion -Jcvf $TARFILE `find $@ | sort` diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 5f20abf..2e38c89 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -5,4 +5,7 @@ export LC_ALL=C ZIPFILE=$1 shift +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + find $@ | sort | zip $ZIPOPTS -X -@ $ZIPFILE diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 78d1d8d..656e225 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -7,8 +7,8 @@ ZIPFILE=`basename $1` mkdir tmp_dzip cd tmp_dzip unzip ../$1 -find . -type f -exec chmod 644 {} \; -find . -type d -exec chmod 755 {} \; +find . -executable -exec chmod 700 {} \; +find . ! -executable -exec chmod 600 {} \; find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE mv $ZIPFILE ../$1 cd .. diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f570a5d..bb030f6 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "noscript(a)noscript.net.xpi" - "uriloader(a)pdf.js.xpi" - "dzip.sh" +- "dtar.sh" - "bare-version" - "bundle.inputs" - "versions" @@ -56,24 +57,20 @@ script: | cd tor-launcher make clean make package + # FIXME: Switch to re-dzip.sh here? mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../../../tor-browser/Data/profile/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton mkdir -p pkg ./makexpi.sh + # FIXME: Switch to re-dzip.sh here? mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../../../tor-browser/Data/profile/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # @@ -114,7 +111,7 @@ script: | cd ../../../ #7z a -sfx tor-browser.exe tor-browser_en-US #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_en-US.7z-selfextract - tar --no-recursion -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz `find tor-browser_en-US | sort` + ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz tor-browser_en-US rm -rf tor-browser_en-US # unzip linux-langpacks.zip @@ -135,7 +132,7 @@ script: | #7z a -sfx tor-browser.exe tor-browser_$LANG #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_$LANG.7z-selfextract - tar --no-recursion -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz `find tor-browser_$LANG | sort` + ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz tor-browser_$LANG rm -rf tor-browser_$LANG cd linux-langpacks diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 1871ff9..eadd5c6 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -51,13 +51,11 @@ script: | cd tor-launcher make clean make package + # FIXME: Switch to re-dzip.sh here? mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi rm ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ @@ -65,13 +63,11 @@ script: | cd torbutton mkdir -p pkg ./makexpi.sh + # FIXME: Switch to re-dzip.sh here? mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi rm ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/torbutton(a)torproject.org.xpi cd ../../../ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c4a686b..97bb9d9 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -52,13 +52,11 @@ script: | cd tor-launcher make clean make package + # FIXME: Switch to re-dzip.sh here? mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi rm ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . mv ../tor-launcher(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ @@ -66,12 +64,10 @@ script: | cd torbutton mkdir -p pkg/tmp ./makexpi.sh + # FIXME: Switch to re-dzip.sh here? cd pkg/tmp unzip ../*.xpi rm ../*.xpi - # FIXME: is there a better way to fix these input umask permissions?? - find . -type f -exec chmod 644 {} \; - find . -type d -exec chmod 755 {} \; ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . mv ../torbutton(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/torbutton(a)torproject.org.xpi cd ../../../

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 6e02ffaa753c4a1adb68911cc6908c2d5485a9ef Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 00:16:17 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 9a5fa80..6e334bd 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用"> <!ENTITY https-everywhere.prefs.disable_all "全部禁用"> -<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认值"> +<!ENTITY https-everywhere.prefs.reset_defaults "重置为默认值"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "注释">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 848a542536c304c77b67c84432fa48cc57c21e84 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 00:16:12 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 9a5fa80..6e334bd 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用"> <!ENTITY https-everywhere.prefs.disable_all "全部禁用"> -<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认值"> +<!ENTITY https-everywhere.prefs.reset_defaults "重置为默认值"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "注释">

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit e8c2dcf9552598e6f1cab799ff5daee1b09e47c4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 00:15:49 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/running.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index fdc80a6..26d6013 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -1,6 +1,7 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 2013 # chen zhang <magnyfx(a)hotmail.com>, 2011 # zhenghua1991 <hua5679(a)gmail.com>, 2012 msgid "" @@ -8,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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-30 00:00+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -119,7 +120,7 @@ msgstr "Vidalia 通过在系统托盘或通知区域中的图标来显示 Tor #: en/running.html:69 msgid "" "Tor is stopped. Select Start from the Vidalia menu to start Tor." -msgstr "Tor 处于停止状态。选择 Vidalia 菜单上的 开始 来开启 Tor。" +msgstr "Tor 处于停止状态。选择 Vidalia 菜单上的开始来开启 Tor。" #. type: Content of: <html><body><table><tr><td> #: en/running.html:76 @@ -149,4 +150,4 @@ msgid "" "with a red X and display an error message letting you know what went wrong. " "You can also check the <a href=\"log.html\">message log</a> for details " "about any problems Tor encountered before it exited." -msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便让用户获悉何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。" +msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit e07097d2c1f7ebdf1da9b34165c4b520004db6e5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 00:15:34 2013 +0000 Update translations for vidalia_help --- zh_CN/running.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index fdc80a6..26d6013 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -1,6 +1,7 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 2013 # chen zhang <magnyfx(a)hotmail.com>, 2011 # zhenghua1991 <hua5679(a)gmail.com>, 2012 msgid "" @@ -8,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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-30 00:00+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -119,7 +120,7 @@ msgstr "Vidalia 通过在系统托盘或通知区域中的图标来显示 Tor #: en/running.html:69 msgid "" "Tor is stopped. Select Start from the Vidalia menu to start Tor." -msgstr "Tor 处于停止状态。选择 Vidalia 菜单上的 开始 来开启 Tor。" +msgstr "Tor 处于停止状态。选择 Vidalia 菜单上的开始来开启 Tor。" #. type: Content of: <html><body><table><tr><td> #: en/running.html:76 @@ -149,4 +150,4 @@ msgid "" "with a red X and display an error message letting you know what went wrong. " "You can also check the <a href=\"log.html\">message log</a> for details " "about any problems Tor encountered before it exited." -msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便让用户获悉何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。" +msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit c6449729cdf8911cfafb706cdbb51ae62d48b4f5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 21:46:12 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index b91924d..9a5fa80 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -16,18 +16,18 @@ <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> -<!ENTITY https-everywhere.prefs.enable_all "启用全部"> -<!ENTITY https-everywhere.prefs.disable_all "禁用全部"> -<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认"> +<!ENTITY https-everywhere.prefs.enable_all "全部启用"> +<!ENTITY https-everywhere.prefs.disable_all "全部禁用"> +<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认值"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "注释"> -<!ENTITY https-everywhere.prefs.list_caption "应启用哪些 HTTPS 重定向规则？"> -<!ENTITY https-everywhere.prefs.enabled "已开启"> +<!ENTITY https-everywhere.prefs.list_caption "应用哪些 HTTPS 重定向规则？"> +<!ENTITY https-everywhere.prefs.enabled "已启用"> <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> -<!ENTITY https-everywhere.prefs.reset_default "重置为默认"> +<!ENTITY https-everywhere.prefs.reset_default "重置为默认值"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "正在下载">

1 0

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

29 Jun '13

commit 42d7300d6cde69f6c9868137ed70edaa2c6bea4e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 21:46:08 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index b91924d..9a5fa80 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -16,18 +16,18 @@ <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> -<!ENTITY https-everywhere.prefs.enable_all "启用全部"> -<!ENTITY https-everywhere.prefs.disable_all "禁用全部"> -<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认"> +<!ENTITY https-everywhere.prefs.enable_all "全部启用"> +<!ENTITY https-everywhere.prefs.disable_all "全部禁用"> +<!ENTITY https-everywhere.prefs.reset_defaults "重设为默认值"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "注释"> -<!ENTITY https-everywhere.prefs.list_caption "应启用哪些 HTTPS 重定向规则？"> -<!ENTITY https-everywhere.prefs.enabled "已开启"> +<!ENTITY https-everywhere.prefs.list_caption "应用哪些 HTTPS 重定向规则？"> +<!ENTITY https-everywhere.prefs.enabled "已启用"> <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> -<!ENTITY https-everywhere.prefs.reset_default "重置为默认"> +<!ENTITY https-everywhere.prefs.reset_default "重置为默认值"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "正在下载">

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 72360270205847c0193c000a6eec774ff4000028 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 21:45:22 2013 +0000 Update translations for vidalia_completed --- zh_CN/vidalia_zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index c03974b..c4ba9a2 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -12,7 +12,7 @@ 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: 2013-06-29 20:50+0000\n" +"PO-Revision-Date: 2013-06-29 21:30+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0