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

[ooni-probe/master] DNS-host-resolution-for-tls_handshake
by art＠torproject.org 20 Feb '14

20 Feb '14

commit 0f855458315fcb2838b630c1f17eb83bebb7a5cf Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Thu Feb 6 17:38:00 2014 +0530 DNS-host-resolution-for-tls_handshake --- ooni/nettests/experimental/tls_handshake.py | 28 ++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/experimental/tls_handshake.py b/ooni/nettests/experimental/tls_handshake.py index c3da9a9..7da291a 100644 --- a/ooni/nettests/experimental/tls_handshake.py +++ b/ooni/nettests/experimental/tls_handshake.py @@ -23,6 +23,8 @@ from socket import error as socket_error from socket import timeout as socket_timeout +from socket import inet_aton as socket_inet_aton +from socket import gethostbyname as socket_gethostbyname from time import sleep import os @@ -105,6 +107,10 @@ class HostUnreachableError(Exception): """Raised when the host IP address appears to be unreachable.""" pass +class HostUnresolveableError(Exception): + """Raised when the host IP address appears to be unreachable.""" + pass + class ConnectionTimeout(Exception): """Raised when we receive a :class:`socket.timeout <timeout>`, in order to pass the Exception along to @@ -212,9 +218,26 @@ class HandshakeTest(nettest.NetTestCase): ## We have to set the default timeout on our sockets before creation: socket.setdefaulttimeout(self.timeout) + def isIP(self,addr): + try: + socket_inet_aton(addr) + return True + except socket_error: + return False + + def resolveHost(self,addr): + try: + return socket_gethostbyname(addr) + except socket_error: + raise HostUnresolveableError def splitInput(self, input): addr, port = input.strip().rsplit(':', 1) + + #if addr is hostname it is resolved to ip + if not self.isIP(addr): + addr=self.resolveHost(addr) + if self.localOptions['port']: port = self.localOptions['port'] return (str(addr), int(port)) @@ -227,7 +250,10 @@ class HandshakeTest(nettest.NetTestCase): for line in fh.readlines(): if line.startswith('#'): continue - yield self.splitInput(line) + try: + yield self.splitInput(line) + except HostUnresolveableError: + continue def buildSocket(self, addr): global s

1 0

[ooni-probe/master] Minor fixes to comments
by art＠torproject.org 20 Feb '14

20 Feb '14

commit a24630c336ab6410ea490a381993a2d7f2fa5755 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Thu Feb 6 17:49:58 2014 +0530 Minor fixes to comments --- ooni/nettests/experimental/tls_handshake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/nettests/experimental/tls_handshake.py b/ooni/nettests/experimental/tls_handshake.py index 7da291a..f775935 100644 --- a/ooni/nettests/experimental/tls_handshake.py +++ b/ooni/nettests/experimental/tls_handshake.py @@ -108,7 +108,7 @@ class HostUnreachableError(Exception): pass class HostUnresolveableError(Exception): - """Raised when the host IP address appears to be unreachable.""" + """Raised when the host address appears to be unresolveable.""" pass class ConnectionTimeout(Exception): @@ -146,7 +146,7 @@ class HandshakeTest(nettest.NetTestCase): usageOptions = HandshakeOptions host = None - inputFile = ['file', 'f', None, 'List of <IP>:<PORT>s to test'] + inputFile = ['file', 'f', None, 'List of <HOST>:<PORT>s to test'] #: Default SSL/TLS context method. context = SSL.Context(SSL.TLSv1_METHOD)

1 0

[ooni-probe/master] Merge pull request #281 from arunpandianp/master
by art＠torproject.org 20 Feb '14

20 Feb '14

commit de4a8eac60873aa5044ddca683cbdd580d3f9847 Merge: 41bab56 a24630c Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Thu Feb 6 17:35:42 2014 +0100 Merge pull request #281 from arunpandianp/master DNS Host Resolution for tls_handshake ooni/nettests/experimental/tls_handshake.py | 36 ++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-)

1 0

[tor-browser-bundle/master] Add a nightly target that builds most things from master's HEAD.
by mikeperry＠torproject.org 20 Feb '14

20 Feb '14

commit 5b2a942b4b9239c0d90473d9faec62403292efb7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 20 12:06:45 2014 +0000 Add a nightly target that builds most things from master's HEAD. --- gitian/Makefile | 18 ++++++++-- gitian/versions.nightly | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index dea589e..c63fdfe 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,5 +1,7 @@ all: clean prep build +nightly: clean prep-nightly build-nightly + alpha: clean prep-alpha build-alpha beta: clean prep-beta build-beta @@ -10,6 +12,12 @@ build: ./mkbundle-mac.sh ./hash-bundles.sh +build-nightly: + ./mkbundle-linux.sh versions.nightly + ./mkbundle-windows.sh versions.nightly + ./mkbundle-mac.sh versions.nightly + ./hash-bundles.sh versions.nightly + build-alpha: ./mkbundle-linux.sh versions.alpha ./mkbundle-windows.sh versions.alpha @@ -28,12 +36,18 @@ sign: sign-alpha: torsocks ./upload-signature.sh versions.alpha +sign-nightly: + ./upload-signature.sh versions.nightly + sign-beta: torsocks ./upload-signature.sh versions.beta match: torsocks ./check-match.sh versions +match-nightly: + ./check-match.sh versions.nightly + match-alpha: torsocks ./check-match.sh versions.alpha @@ -44,9 +58,9 @@ prep: ./check-prerequisites.sh torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions -prep-alpha: +prep-nightly: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.nightly prep-beta: ./check-prerequisites.sh diff --git a/gitian/versions.nightly b/gitian/versions.nightly new file mode 100755 index 0000000..d320804 --- /dev/null +++ b/gitian/versions.nightly @@ -0,0 +1,84 @@ +TORBROWSER_VERSION=tbb-nightly +BUNDLE_LOCALES="ar ru zh-CN" + +VERIFY_TAGS=0 + +TORBROWSER_TAG=tor-browser-24.3.0esr-2 +TOR_TAG=master +TORLAUNCHER_TAG=master +TORBUTTON_TAG=master +HTTPSE_TAG=master +NSIS_TAG=master +ZLIB_TAG=v1.2.8 +LIBEVENT_TAG=release-2.0.21-stable +MINGW_REV=6184 +PYPTLIB_TAG=master +OBFSPROXY_TAG=master +FLASHPROXY_TAG=master + +GITIAN_TAG=tor-browser-builder-3.0-4 + +OPENSSL_VER=1.0.1f +FIREFOX_LANG_VER=24.3.0esr +BINUTILS_VER=2.22 +GCC_VER=4.6.3 +PYTHON_VER=2.7.5 +PYCRYPTO_VER=2.6.1 +ARGPARSE_VER=1.2.1 +ZOPEINTERFACE_VER=4.0.5 +TWISTED_VER=13.1.0 +M2CRYPTO_VER=0.21.1 +PY2EXE_VER=0.6.9 +SETUPTOOLS_VER=1.4 + +## File names for the source packages +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi +TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +MINGW_PACKAGE=mingw-w64-svn-snapshot.zip +MSVCR100_PACKAGE=msvcr100.dll +BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 +GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 +PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi +PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz +ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip +TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 +M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz +PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe +SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz + +# Hashes for packages with weak sigs or no sigs +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 +MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f +MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c +ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc +TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a +PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c +SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + +## Non-git package URLs +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} +OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} +BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} +GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE} +ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE} +TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PACKAGE} +# TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} +M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} +PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS_PACKAGE}

1 0

[tor/master] fixed long -> int implicit cast warning line 3453
by nickm＠torproject.org 20 Feb '14

20 Feb '14

commit b063ebbc60a1fce9526b00c2fdfd9c0475652420 Author: Nick Hopper <hopper(a)cs.umn.edu> Date: Thu Feb 20 05:48:47 2014 -0600 fixed long -> int implicit cast warning line 3453 --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index 054de3d..3c2f664 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3450,7 +3450,7 @@ format_number_sigsafe(unsigned long x, char *buf, int buf_len, cp = buf + len; *cp = '\0'; do { - unsigned digit = x % radix; + unsigned digit = (unsigned) (x % radix); tor_assert(cp > buf); --cp; *cp = "0123456789ABCDEF"[digit];

1 0

[tor/master] Changes file for b063ebbc60a1fce9
by nickm＠torproject.org 20 Feb '14

20 Feb '14

commit 8d5215c6a00bc63a5df73800854cc45d2a8f980a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 20 11:55:38 2014 +0000 Changes file for b063ebbc60a1fce9 This bugfix didn't get a trac ticket because the internet in this room is an exercise in futility. --- changes/sigsafe_fmt_warning | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/sigsafe_fmt_warning b/changes/sigsafe_fmt_warning new file mode 100644 index 0000000..eeb4710 --- /dev/null +++ b/changes/sigsafe_fmt_warning @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a 64-to-32-conversion warning in format_number_sigsafe(). + Bugfix on 0.2.5.2-alpha; patch from Nick Hopper. +

1 0

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

19 Feb '14

commit 877b8816eb52d22a95039ea079675eb1d4d1253a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 19 21:45:49 2014 +0000 Update translations for tails-iuk_completed --- zh_CN.po | 103 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index fa0b75c..f394f1e 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-01-07 20:17+0100\n" -"PO-Revision-Date: 2014-01-19 04:40+0000\n" +"POT-Creation-Date: 2014-02-18 19:03+0100\n" +"PO-Revision-Date: 2014-02-19 21:20+0000\n" "Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../lib/Tails/IUK/Frontend.pm:145 ../lib/Tails/IUK/Frontend.pm:615 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:657 #, perl-brace-format msgid "" "Debugging information\n" @@ -32,11 +32,11 @@ msgid "" "%{stderr}s" msgstr "调试信息\n退出代码: %{exit_code}i\n\nstdout:\n%{stdout}s\n\nstderr:\n%{stderr}s" -#: ../lib/Tails/IUK/Frontend.pm:205 +#: ../lib/Tails/IUK/Frontend.pm:214 msgid "Error while checking for upgrades" msgstr "检查更新时错误" -#: ../lib/Tails/IUK/Frontend.pm:208 +#: ../lib/Tails/IUK/Frontend.pm:217 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -45,39 +45,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "无法从我们的网站上检测是否有升级可用\n\n请检查您的网络连接，并且重启Tails然后重新尝试升级\n\n如果依旧有这个问题，请到 file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:224 +#: ../lib/Tails/IUK/Frontend.pm:231 +msgid "no incremental upgrade is available." +msgstr "没有增量升级可用。" + +#: ../lib/Tails/IUK/Frontend.pm:234 +msgid "your device was not created using Tails Installer." +msgstr "您的设备并未使用 Tails 安装器创建。" + +#: ../lib/Tails/IUK/Frontend.pm:237 +msgid "your device is not writable." +msgstr "您的设备不可写入。" + +#: ../lib/Tails/IUK/Frontend.pm:240 +msgid "there is not enough free space on your device." +msgstr "您的设备上没有足够的可用空间。" + +#: ../lib/Tails/IUK/Frontend.pm:243 +msgid "there is not enough free memory." +msgstr "没有足够的可用内存。" + +#: ../lib/Tails/IUK/Frontend.pm:248 +#, perl-brace-format +msgid "No explanation available for reason '%{reason}s'." +msgstr "对原因 '%{reason}s' 没有可用的说明。" + +#: ../lib/Tails/IUK/Frontend.pm:268 msgid "The system is up-to-date" msgstr "系统已是最新" -#: ../lib/Tails/IUK/Frontend.pm:229 +#: ../lib/Tails/IUK/Frontend.pm:273 msgid "This version of Tails is outdated, and may have security issues." msgstr "此版本的 Tails 已过时，可能存在安全性问题。" -#: ../lib/Tails/IUK/Frontend.pm:262 +#: ../lib/Tails/IUK/Frontend.pm:305 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "可用的增量升级，需要在 Tails 的系统分区有 %{space_needed}s 空闲空间，而目前仅有 %{free_space}s 可用。" -#: ../lib/Tails/IUK/Frontend.pm:279 +#: ../lib/Tails/IUK/Frontend.pm:321 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "可用的增量升级，需要有 %{space_needed}s 空闲空间，而目前仅有 %{free_space}s 可用。" -#: ../lib/Tails/IUK/Frontend.pm:301 +#: ../lib/Tails/IUK/Frontend.pm:343 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "增量升级可用但是没有完整升级。\n这不应该发生，请将此事报告为bug。" -#: ../lib/Tails/IUK/Frontend.pm:305 +#: ../lib/Tails/IUK/Frontend.pm:347 msgid "Error while detecting available upgrades" msgstr "检测可用升级时错误" -#: ../lib/Tails/IUK/Frontend.pm:315 +#: ../lib/Tails/IUK/Frontend.pm:357 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -93,44 +118,44 @@ msgid "" "Do you want to upgrade now?" msgstr "您应该升级到 %{name}s %{version}s.\n\n查看关于新版本的更多信息，请到 %{details_url}s.\n\n建议在升级过程中关闭所有打开的程序\n下载升级可能需要用很长时间，从数分钟到数小时不等\n下载升级之后网络将被禁用\n\n下载大小: %{size}s\n\n您想现在升级么？" -#: ../lib/Tails/IUK/Frontend.pm:330 +#: ../lib/Tails/IUK/Frontend.pm:372 msgid "Upgrade available" msgstr "有升级可用" -#: ../lib/Tails/IUK/Frontend.pm:331 +#: ../lib/Tails/IUK/Frontend.pm:373 msgid "Upgrade now" msgstr "现在升级" -#: ../lib/Tails/IUK/Frontend.pm:332 +#: ../lib/Tails/IUK/Frontend.pm:374 msgid "Upgrade later" msgstr "稍后升级" -#: ../lib/Tails/IUK/Frontend.pm:342 +#: ../lib/Tails/IUK/Frontend.pm:382 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" "\n" "For more information about this new version, go to %{details_url}s.\n" "\n" -"It is not possible to automatically upgrade your device to this new version.\n" +"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "您应该手动升级到 %{name}s %{version}s。\n\n有关此版本的更多信息，请见 %{details_url}s。\n\n无法自动升级您的设备到这个新版本。\n\n要了解如何进行手动升级，请阅 https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "您应当手动升级到 %{name}s %{version}s。\n\n有关此版本的更多信息请见 %{details_url}s。\n\n不能自动升级您的设备到新版本 %{explanation}s。\n\n关于如何进行手动升级，请见 https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:398 msgid "New version available" msgstr "新版本可用" -#: ../lib/Tails/IUK/Frontend.pm:412 +#: ../lib/Tails/IUK/Frontend.pm:454 msgid "Downloading upgrade" msgstr "正在下载升级" -#: ../lib/Tails/IUK/Frontend.pm:415 +#: ../lib/Tails/IUK/Frontend.pm:457 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "正在下载升级包到%{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:456 +#: ../lib/Tails/IUK/Frontend.pm:498 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -138,7 +163,7 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "该升级不能被下载.\\n\\n检查您的网络连接，并且重启Tails然后重新尝试升级.\\n\\n如果依旧有这个问题，请到 file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:510 #, perl-brace-format msgid "" "Debugging information\n" @@ -148,26 +173,26 @@ msgid "" "%{stderr}s" msgstr "调试信息\n退出代码: %{exit_code}i\n\nstderr:\n%{stderr}s" -#: ../lib/Tails/IUK/Frontend.pm:480 ../lib/Tails/IUK/Frontend.pm:494 +#: ../lib/Tails/IUK/Frontend.pm:522 ../lib/Tails/IUK/Frontend.pm:536 msgid "Error while downloading the upgrade" msgstr "在下载升级时出现错误" -#: ../lib/Tails/IUK/Frontend.pm:487 +#: ../lib/Tails/IUK/Frontend.pm:529 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "输出文件'%{output_file}s'不存在，但是 tails-iuk-get-target-file 并没有察觉，请将此事报告为bug。" -#: ../lib/Tails/IUK/Frontend.pm:506 +#: ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while creating temporary downloading directory" msgstr "建立临时下载目录时出错" -#: ../lib/Tails/IUK/Frontend.pm:509 +#: ../lib/Tails/IUK/Frontend.pm:551 msgid "Failed to create temporary download directory" msgstr "创建临时下载目录时错误" -#: ../lib/Tails/IUK/Frontend.pm:521 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -177,46 +202,46 @@ msgid "" "Do you want to restart now?" msgstr "您的Tails设备成功升级\n\n一些安全特性已经被临时禁用.\n您应该尽快重启到新版本\n\n您想重启么？" -#: ../lib/Tails/IUK/Frontend.pm:526 +#: ../lib/Tails/IUK/Frontend.pm:568 msgid "Restart Tails" msgstr "重启Tails" -#: ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:569 msgid "Restart now" msgstr "现在重启" -#: ../lib/Tails/IUK/Frontend.pm:528 +#: ../lib/Tails/IUK/Frontend.pm:570 msgid "Restart later" msgstr "稍后重启" -#: ../lib/Tails/IUK/Frontend.pm:539 +#: ../lib/Tails/IUK/Frontend.pm:581 msgid "Error while restarting the system" msgstr "重启系统时出现错误" -#: ../lib/Tails/IUK/Frontend.pm:542 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Failed to restart the system" msgstr "重启系统失败" -#: ../lib/Tails/IUK/Frontend.pm:557 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Error while shutting down the network" msgstr "关闭网络时错误" -#: ../lib/Tails/IUK/Frontend.pm:560 +#: ../lib/Tails/IUK/Frontend.pm:602 msgid "Failed to shutdown network" msgstr "关闭网络失败" -#: ../lib/Tails/IUK/Frontend.pm:570 +#: ../lib/Tails/IUK/Frontend.pm:612 msgid "Upgrading the system" msgstr "正在升级系统" -#: ../lib/Tails/IUK/Frontend.pm:572 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "您的Tails已经被成功升级...\n\n为了安全原因，网络连接已经被禁用。" -#: ../lib/Tails/IUK/Frontend.pm:609 +#: ../lib/Tails/IUK/Frontend.pm:651 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -224,6 +249,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "安装更新时出现错误\\n\\n您的Tails设备需要修复，并且可能无法重启.\\n\\n请查看以下说明：file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:629 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "Error while installing the upgrade" msgstr "安装升级时出错"

1 0

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

19 Feb '14

commit 9722914ada914bbe4a52b61767f189d0d076f3be Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 19 21:45:47 2014 +0000 Update translations for tails-iuk --- zh_CN.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index dbe64ee..f394f1e 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-02-18 19:03+0100\n" -"PO-Revision-Date: 2014-02-19 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-19 21:20+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,28 +47,28 @@ msgstr "无法从我们的网站上检测是否有升级可用\n\n请检 #: ../lib/Tails/IUK/Frontend.pm:231 msgid "no incremental upgrade is available." -msgstr "" +msgstr "没有增量升级可用。" #: ../lib/Tails/IUK/Frontend.pm:234 msgid "your device was not created using Tails Installer." -msgstr "" +msgstr "您的设备并未使用 Tails 安装器创建。" #: ../lib/Tails/IUK/Frontend.pm:237 msgid "your device is not writable." -msgstr "" +msgstr "您的设备不可写入。" #: ../lib/Tails/IUK/Frontend.pm:240 msgid "there is not enough free space on your device." -msgstr "" +msgstr "您的设备上没有足够的可用空间。" #: ../lib/Tails/IUK/Frontend.pm:243 msgid "there is not enough free memory." -msgstr "" +msgstr "没有足够的可用内存。" #: ../lib/Tails/IUK/Frontend.pm:248 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "对原因 '%{reason}s' 没有可用的说明。" #: ../lib/Tails/IUK/Frontend.pm:268 msgid "The system is up-to-date" @@ -140,7 +140,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "您应当手动升级到 %{name}s %{version}s。\n\n有关此版本的更多信息请见 %{details_url}s。\n\n不能自动升级您的设备到新版本 %{explanation}s。\n\n关于如何进行手动升级，请见 https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:398 msgid "New version available"

1 0

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

19 Feb '14

commit e2ed8c171f0bce8f4922fb9a395744b294afcb39 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 19 21:15:46 2014 +0000 Update translations for tails-iuk --- uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk.po b/uk.po index 3c9a992..3a25313 100644 --- a/uk.po +++ b/uk.po @@ -9,7 +9,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-18 19:03+0100\n" -"PO-Revision-Date: 2014-02-19 20:45+0000\n" +"PO-Revision-Date: 2014-02-19 20:51+0000\n" "Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

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

19 Feb '14

commit 92e28b5f5da55a9adfd577d6b3559050f474ed64 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 19 20:45:49 2014 +0000 Update translations for tails-iuk --- uk.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/uk.po b/uk.po index 4624787..3c9a992 100644 --- a/uk.po +++ b/uk.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-02-18 19:03+0100\n" -"PO-Revision-Date: 2014-02-19 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-19 20:45+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +29,7 @@ msgid "" "\n" "stderr:\n" "%{stderr}s" -msgstr "" +msgstr "Відладочна інформація\nexit code: %{exit_code}i\n\nstdout:\n%{stdout}s\n\nstderr:\n%{stderr}s" #: ../lib/Tails/IUK/Frontend.pm:214 msgid "Error while checking for upgrades" @@ -46,23 +46,23 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:231 msgid "no incremental upgrade is available." -msgstr "" +msgstr "немає додаткових оновлень." #: ../lib/Tails/IUK/Frontend.pm:234 msgid "your device was not created using Tails Installer." -msgstr "" +msgstr "Ваш пристрій не був створений за допомогою Tails Installer." #: ../lib/Tails/IUK/Frontend.pm:237 msgid "your device is not writable." -msgstr "" +msgstr "Ваш пристрій недоступний для запису." #: ../lib/Tails/IUK/Frontend.pm:240 msgid "there is not enough free space on your device." -msgstr "" +msgstr "не вистачає вільного місця на Вашому пристрої." #: ../lib/Tails/IUK/Frontend.pm:243 msgid "there is not enough free memory." -msgstr "" +msgstr "не вистачає вільної пам'яті." #: ../lib/Tails/IUK/Frontend.pm:248 #, perl-brace-format @@ -75,7 +75,7 @@ msgstr "Усі останні оновлення встановлено" #: ../lib/Tails/IUK/Frontend.pm:273 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "Ця версія Tails застаріла і може мати проблеми з безпекою." #: ../lib/Tails/IUK/Frontend.pm:305 #, perl-brace-format @@ -95,7 +95,7 @@ msgstr "" msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Тільки додаткове, а не повне оновлення доступно.\nЦього не повинно було статися. Будь ласка, повідомте про помилку." #: ../lib/Tails/IUK/Frontend.pm:347 msgid "Error while detecting available upgrades" @@ -152,7 +152,7 @@ msgstr "Завантаження оновлення" #: ../lib/Tails/IUK/Frontend.pm:457 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "Завантаження оновлення до %{name}s %{version}s..." #: ../lib/Tails/IUK/Frontend.pm:498 msgid "" @@ -170,7 +170,7 @@ msgid "" "\n" "stderr:\n" "%{stderr}s" -msgstr "" +msgstr "Відладочна інформація\nexit code: %{exit_code}i\n\nstderr:\n%{stderr}s" #: ../lib/Tails/IUK/Frontend.pm:522 ../lib/Tails/IUK/Frontend.pm:536 msgid "Error while downloading the upgrade"

1 0