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

[tor-browser-bundle/master] Install a pwd-setting tor wrapper as in #10030.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit ef72db99d24548a7138bb2f372735ca23afc12a3 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 15 05:33:11 2013 +0000 Install a pwd-setting tor wrapper as in #10030. --- Bundle-Data/mac-tor.sh | 8 ++++++++ gitian/descriptors/mac/gitian-bundle.yml | 4 ++++ gitian/mkbundle-mac.sh | 1 + 3 files changed, 13 insertions(+) diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh new file mode 100755 index 0000000..5f7c099 --- /dev/null +++ b/Bundle-Data/mac-tor.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# Set the current working directory to the directory containing this executable, +# so that pluggable transport executables can be given with relative paths. This +# works around a change in OS X 10.9, where the current working directory is +# otherwise set to "/" when an application bundle is started from Finder. +# https://trac.torproject.org/projects/tor/ticket/10030 +cd "$(dirname "$0")" +exec ./tor.real "$@" diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index c991428..8f90e7d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "mac-tor.sh" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -99,6 +100,9 @@ script: | cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip + # Install a "tor" shim that sets the working directory. See #10030. + mv Tor/tor Tor/tor.real + cp ~/build/mac-tor.sh Tor/tor cd Contents/MacOS/ unzip ~/build/tor-browser-mac$GBUILD_BITS-gbuilt.zip cd ../../../ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 191b1e1..8e4da79 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -50,6 +50,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip

1 0

[tor-browser-bundle/master] Download pyptlib.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit a3e7f4da7eb23390123835d6e7b8c6671526a176 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 6 05:37:44 2013 +0000 Download pyptlib. gpg --output gpg/pyptlib.gpg --export --export-options export-minimal 0x15F271D9 --- gitian/fetch-inputs.sh | 1 + gitian/gpg/pyptlib.gpg | Bin 0 -> 2215 bytes gitian/verify-tags.sh | 1 + gitian/versions | 1 + gitian/versions.alpha | 1 + 5 files changed, 4 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9f54f61..150a34f 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -262,6 +262,7 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git EOF exit 0 diff --git a/gitian/gpg/pyptlib.gpg b/gitian/gpg/pyptlib.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/gitian/gpg/pyptlib.gpg differ diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 73016a8..2e3f92a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -61,6 +61,7 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG openssl tor.gpg $OPENSSL_TAG +pyptlib pyptlib.gpg $PYPTLIB_TAG EOF cd "$INPUTS_DIR" diff --git a/gitian/versions b/gitian/versions index eebfe7d..ee472d7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -13,6 +13,7 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 +PYPTLIB_TAG=pyptlib-0.0.4 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7465b39..cbb3721 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -13,6 +13,7 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 +PYPTLIB_TAG=pyptlib-0.0.4 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] Download argparse.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit ed35aa668c0b87348516bb3e208e57505b783719 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 04:29:48 2013 +0000 Download argparse. It's on a mirror because it 404s half the time. Restarting the download right away always works. But it often fails the first time you run fetch-inputs.sh after a while. The googlecode download also has the property that you have to download the entire file even if your local copy is newer (that's why the TOOLCHAIN4 download from googlecode is also disabled), but that's not as big a problem as the failed downloads because the argparse package is small. --- gitian/fetch-inputs.sh | 13 ++++++++++++- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 1fdaa66..dc6332b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -4,6 +4,7 @@ # MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ +MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ set -e set -u umask 0022 @@ -158,6 +159,15 @@ do get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done +# XXX: Omit ARGPARSE because Google won't allow wget -N and because the +# download seems to 404 about 50% of the time. +for i in ARGPARSE +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_DCF}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" +done + # Verify packages with weak or no signatures via multipath downloads # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) # XXX: Google won't allow wget -N.. We need to re-download the whole @@ -200,7 +210,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -240,6 +250,7 @@ ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz +ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/versions b/gitian/versions index d62333f..fe0b1e0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,6 +23,7 @@ BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 +ARGPARSE_VER=1.2.1 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -35,6 +36,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz +ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -44,6 +46,7 @@ NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c +ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -54,3 +57,4 @@ GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… +ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 042049d..8c8d58d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,6 +23,7 @@ BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 +ARGPARSE_VER=1.2.1 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -35,6 +36,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz +ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -44,6 +46,7 @@ NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c +ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -54,3 +57,4 @@ GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… +ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}

1 0

[tor-browser-bundle/master] Download pycrypto.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 7035a4d7f9ec7f9bf07495b7f5f1b5f568aa55f6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 03:43:05 2013 +0000 Download pycrypto. gpg --output gpg/PYCRYPTO.gpg --export --export-options export-minimal 0x39C25CF7 The sha256sum for pycrypto-2.6.1.tar.gz and the author's key fingerprint are at https://www.dlitz.net/software/pycrypto/. --- gitian/fetch-inputs.sh | 7 ++++--- gitian/gpg/PYCRYPTO.gpg | Bin 0 -> 4710 bytes gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 150a34f..1fdaa66 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -131,11 +131,11 @@ checkout_mingw() { # fi #done -for i in BINUTILS GCC PYTHON +for i in BINUTILS GCC PYTHON PYCRYPTO do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -200,7 +200,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -239,6 +239,7 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 +ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/gpg/PYCRYPTO.gpg b/gitian/gpg/PYCRYPTO.gpg new file mode 100644 index 0000000..5ae537d Binary files /dev/null and b/gitian/gpg/PYCRYPTO.gpg differ diff --git a/gitian/versions b/gitian/versions index ee472d7..d62333f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -22,6 +22,7 @@ FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 +PYCRYPTO_VER=2.6.1 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -33,6 +34,7 @@ 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 +PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -41,6 +43,7 @@ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -50,3 +53,4 @@ 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/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cbb3721..042049d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,6 +22,7 @@ FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 +PYCRYPTO_VER=2.6.1 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -33,6 +34,7 @@ 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 +PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -41,6 +43,7 @@ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -50,3 +53,4 @@ 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/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit 35975447b3d7160249cb0d552d2e32343c667a50 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:41 2014 +0000 Update translations for torbutton-torbuttonproperties --- km/torbutton.properties | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/km/torbutton.properties b/km/torbutton.properties index 060d463..f495c74 100644 --- a/km/torbutton.properties +++ b/km/torbutton.properties @@ -23,20 +23,20 @@ torbutton.prefs.optional = (ជាជម្រើស) torbutton.prefs.crucial = (ចាំបាច់) torbutton.popup.external.title = ផ្ទុកមាតិកាខាងក្រៅ? torbutton.popup.external.app = ត្រូវការកម្មវិធីខាងក្រៅមួយដើម្បីគ្រប់គ្រង៖\n -torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n -torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n -torbutton.popup.launch = Launch application -torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? -torbutton.popup.captcha.title = Avoid Google Captchas? -torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? -torbutton.popup.captcha.always = Always perform this action from now on -torbutton.popup.redirect = Redirect -torbutton.popup.no_redirect = Don't Redirect -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor(a)torproject.org or by downloading it at the following URL: +torbutton.popup.external.note = \n\n\n +# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n +torbutton.popup.launch = ចាប់ផ្ដើមកម្មវិធី +torbutton.popup.cancel = បោះបង់ +torbutton.popup.dontask = ចាប់ផ្ដើមកម្មវិធីជានិច្ចចាប់ពីពេលនេះទៅ +torbutton.popup.test.no_http_proxy = ការសាកល្បងប្រូកស៊ីរបស់ Tor ៖ ប្រូកស៊ីរបស់ HTTP មូលដ្ឋានមិនអាចទៅដល់។ តើ Polipo កំពុងដំណើរការត្រឹមត្រូវឬ? +torbutton.popup.captcha.title = ជៀសវាង Google Captchas? +torbutton.popup.captcha.ask = Torbutton បានរកឃើញ Google Captcha ។ តើអ្នកចង់ទៅម៉ាស៊ីនស្វែងរកផ្សេងៗទៀតផ្ទាល់ឡើងវិញសម្រាប់សំណួរនេះ? +torbutton.popup.captcha.always = អនុវត្តសកម្មភាពនេះជានិច្ចចាប់ពីពេលនេះទៅ +# torbutton.popup.redirect = Redirect +# torbutton.popup.no_redirect = Don't Redirect +torbutton.popup.prompted_language = ដើម្បីផ្ដល់ឲ្យអ្នកនូវភាពឯកជនជាច្រើន, Torbutton អាចស្នើកំណែភាសាអង់គ្លេសនៃទំព័របណ្ដាញ។ វាអាចធ្វើឲ្យទំព័របណ្ដាញដែលអ្នកចង់អានជាភាសាដើមរបស់អ្នក ត្រូវបង្ហាញជាភាសាអង់គ្លេសជំនួសវិញ។\n\nWould you like to request English language web pages for better privacy? +torbutton.popup.no_newnym = Torbutton មិនអាចមានសុវត្ថិភាពក្នុងការផ្ដល់ឲ្យអ្នកនូវអត្តសញ្ញាណថ្មី។ វាមិនមានការចូលដំណើរការទៅច្រកពិនិត្យរបស់ Tor ។ \n\nតើអ្នកកំពុងដំណើរការ Tor Browser Bundle ឬ? +# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor(a)torproject.org or by downloading it at the following URL: torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit a0e858b3399fcf56fb4845b39650a94df7137a62 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:39 2014 +0000 Update translations for torbutton-browserproperties_completed --- km/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/km/browser.properties b/km/browser.properties new file mode 100644 index 0000000..295a03a --- /dev/null +++ b/km/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=about:tor + +# Spell checker dictionary +spellchecker.dictionary=en_US + +# Default search engine +browser.search.defaultenginename=Startpage + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit 86ab002a07e391144c86807b291b2e79efcbcf53 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:36 2014 +0000 Update translations for torbutton-browserproperties --- km/browser.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/km/browser.properties b/km/browser.properties index fd25b10..295a03a 100644 --- a/km/browser.properties +++ b/km/browser.properties @@ -1,13 +1,13 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=about:tor # Spell checker dictionary -# spellchecker.dictionary=en_US +spellchecker.dictionary=en_US # Default search engine -# browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Startpage # Search engine order (order displayed in the search bar dropdown) -# browser.search.order.1=Startpage -# browser.search.order.2=DuckDuckGo -# browser.search.order.3=Google +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit 7eab77a7d78f70829bfa8a487e4b9fa156dfd816 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:33 2014 +0000 Update translations for torbutton-branddtd --- km/brand.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/brand.dtd b/km/brand.dtd index e34f480..76e405d 100644 --- a/km/brand.dtd +++ b/km/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> -<!ENTITY vendorShortName ""> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandFullName "Tor Browser"> +<!ENTITY vendorShortName "Tor Project"> +<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit 2c10588cc364542147f249ca96203ba518ac6eb8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:29 2014 +0000 Update translations for torbutton-brandproperties --- km/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/brand.properties b/km/brand.properties index 6598ccd..8c6932a 100644 --- a/km/brand.properties +++ b/km/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# brandShortName=TorBrowser +brandShortName=TorBrowser # brandFullName=Tor Browser # vendorShortName=Tor Project

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Jan '14

21 Jan '14

commit 1da4731533d423fe5597631bd008ccb25b95a70e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 21 04:46:23 2014 +0000 Update translations for tails-misc --- km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km.po b/km.po index 562a1ac..4acf4b0 100644 --- a/km.po +++ b/km.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-21 02:30+0000\n" +"PO-Revision-Date: 2014-01-21 04:20+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0