[tor-commits] [torbutton/master] Bug 10078: clearing crypto auth tokens; removing own handling of SSL session identifier cache as we get that for free when calling logoutAndTeardown()
commit 553789b32ad3cb26e854038e3db508072a72c2a2 Author: Georg Koppen g.kop...@jondos.de Date: Thu Nov 28 13:15:41 2013 +0100 Bug 10078: clearing crypto auth tokens; removing own handling of SSL session identifier cache as we get that for free when calling logoutAndTeardown() --- src/chrome/content/torbutton.js | 22 ++ 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fcdc0d8..b47d394 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1465,22 +1465,12 @@ function torbutton_do_new_identity() { torbutton_log(3, New Identity: Clearing Crypto Tokens); - try { -// This clears the SSL identifier cache. -// See https://bugzilla.mozilla.org/show_bug.cgi?id=448747. But bug 683262 -// removes nsIDOMCrypto.logout(). We need to resort to our previous fallback -// method: switching a proper preference that triggers clearing the SSL -// identifier cache. -// See: https://mxr.mozilla.org/comm-esr24/source/mozilla/security/manager/ssl/src/nsNSSComponent.cpp#1625 for the ones being available. -// secruity.enable_md5_signatures seems to be a good choice as it is still -// available on trunk. -m_tb_prefs.setBoolPref(security.enable_md5_signatures, !m_tb_prefs. - getBoolPref(security.enable_md5_signatures)); -m_tb_prefs.setBoolPref(security.enable_md5_signatures, !m_tb_prefs. - getBoolPref(security.enable_md5_signatures)); - } catch(e) { -torbutton_log(4, Failed to clear SSL session ids: +e); - } + // Clear all crypto auth tokens. This includes calls to PK11_LogoutAll(), + // nsNSSComponent::LogoutAuthenticatedPK11() and clearing the SSL session + // cache. + let sdr = Components.classes[@mozilla.org/security/sdr;1]. + getService(Components.interfaces.nsISecretDecoderRing); + sdr.logoutAndTeardown(); // This clears the OCSP cache. // ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] Make --enable-strip work again
commit a4fc2ee70f1511dfc258990f680b67bdae1fff78 Author: Georg Koppen g.kop...@jondos.de Date: Tue Nov 12 10:50:31 2013 +0100 Make --enable-strip work again Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=841373 --- config/rules.mk|6 +++--- js/src/config/rules.mk |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index f64edab..174af2c 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -883,7 +883,7 @@ else # !WINNT || GNU_CC endif # WINNT !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -937,7 +937,7 @@ else endif # WINNT !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1051,7 +1051,7 @@ endif # WINNT !GCC @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index f64edab..174af2c 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -883,7 +883,7 @@ else # !WINNT || GNU_CC endif # WINNT !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -937,7 +937,7 @@ else endif # WINNT !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1051,7 +1051,7 @@ endif # WINNT !GCC @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] fixup! Build determinism fixes
commit 1aeb666ddcb29fe80cecaa01d8239e63e4593e5f Author: Georg Koppen g.kop...@jondos.de Date: Thu Nov 28 10:28:58 2013 +0100 fixup! Build determinism fixes Bug 10235: fixing determinism issues when packaging (JavaScript) resources into omni.ja files; patch by Mike Hommey --- toolkit/mozapps/installer/precompile_cache.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/precompile_cache.js b/toolkit/mozapps/installer/precompile_cache.js index f57145b..9ac2ada 100644 --- a/toolkit/mozapps/installer/precompile_cache.js +++ b/toolkit/mozapps/installer/precompile_cache.js @@ -65,7 +65,7 @@ function get_modules_under(uri) { } function load_modules_under(spec, uri) { - var entries = get_modules_under(uri); + var entries = get_modules_under(uri).sort(); // The precompilation of JS here sometimes reports errors, which we don't // really care about. But if the errors are ever reported to xpcshell's // error reporter, it will cause it to return an error code, which will break ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Linus is called linus.
commit b575c59a33367af3366d0461cd5815acf1217ef7 Author: Mike Perry mikeperry-...@torproject.org Date: Sun Dec 1 23:08:20 2013 -0800 Linus is called linus. --- gitian/check-match.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 907fbfe..09bf179 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS=ln5 mikeperry erinn gk +USERS=linus mikeperry erinn gk set -e set -u ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug #9828: Fix python and omni.ja for Mac and Windows.
commit 15fb918cae1e97b1886ba85289a90afb70bf0f4f Author: Mike Perry mikeperry-...@torproject.org Date: Wed Nov 27 20:12:26 2013 -0800 Bug #9828: Fix python and omni.ja for Mac and Windows. Firefox requires python 2.7 now, and has a new omni.ja. --- gitian/descriptors/mac/gitian-bundle.yml |9 +++-- gitian/descriptors/mac/gitian-firefox.yml | 19 +++ gitian/descriptors/windows/gitian-bundle.yml |9 +++-- gitian/descriptors/windows/gitian-firefox.yml | 21 + 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index ade303b..2ef8834 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -105,12 +105,17 @@ script: | cp versions TorBrowserBundle.app/Docs/sources/ cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs # - cd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + # FF24 puts the prefs in a different jar: + if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + else + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + fi unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo pref(\general.useragent.locale\, \en-US\); defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../../../../ + popd # XXX: DMG plz cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 8230abc..d6e5b4a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -26,10 +26,13 @@ files: - i686-apple-darwin11-ld - re-dzip.sh - dzip.sh +- python.tar.bz2 +- versions #- apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb #- apple-x86-odcctools_758.159-0flosoft11_i386.deb script: | INSTDIR=$HOME/install/ + source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -43,6 +46,19 @@ script: | mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ # + # XXX: Refactor this out into a separate descriptor + # Fx 24 ESR does not work with Python 2.7 anymore. But 10.04 does only ship + # with Python 2.6. Thus, we compile 2.7 ourselves... + if [ ${TORBROWSER_VERSION::3} != 3.0 ]; then +mkdir python +cd python +tar -xjvf ../python.tar.bz2 +Python-*/configure +make +sudo make install +cd .. + fi + # sudo dpkg -i *.deb chmod 755 i686* sudo cp i686* /usr/bin/ @@ -84,5 +100,8 @@ script: | cd $INSTDIR ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja + if [ -f TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then # FF24 includes a third .ja +~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/browser/omni.ja + fi ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./TorBrowser.app cp tor-browser-mac${GBUILD_BITS}-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 44e1662..5ee9056 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -107,12 +107,17 @@ script: | cp ../versions Tor Browser/Docs/sources/ cp ../bundle.inputs Tor Browser/Docs/sources/ # - cd Tor Browser/Browser + # FF24 puts the prefs in a different jar: + if [ -f Tor Browser/Browser/browser/omni.ja ]; then + pushd Tor Browser/Browser/browser/ + else + pushd Tor Browser/Browser/ + fi unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo pref(\general.useragent.locale\, \en-US\); defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../ + popd makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 31e782f..94b6ba0 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -32,8 +32,11 @@ files: - i686-w64-mingw32-g++ - i686-w64-mingw32-ld - msvcr100.dll +- python.tar.bz2 +- versions script: | INSTDIR=$HOME/install + source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export
[tor-browser-bundle/master] Fix #10213; change LDPATH→LD_LIBRARY_PATH in RelativeLink.sh.
commit 4703dd9b3f917ee9ea6306c6ac6643e09cb563a7 Author: Isis Lovecruft i...@torproject.org Date: Sun Dec 1 04:25:15 2013 + Fix #10213; change LDPATHâLD_LIBRARY_PATH in RelativeLink.sh. --- RelativeLink/RelativeLink.sh |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index b2255f6..4a10c58 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -206,8 +206,8 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LDPATH=${HOME}/Tor/ -export LDPATH +LD_LIBRARY_PATH=${HOME}/Tor/ +export LD_LIBRARY_PATH # XXX: Debug mode for Firefox?? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'isis/fix/10213-LD_LIBRARY_PATH-missing' into ff24-staging
commit bfdbe3eb7d6aea8ef9aded9bd7fbc1da8275f1a4 Merge: 6a581a2 4703dd9 Author: Mike Perry mikeperry-...@torproject.org Date: Sun Dec 1 22:55:07 2013 -0800 Merge remote-tracking branch 'isis/fix/10213-LD_LIBRARY_PATH-missing' into ff24-staging RelativeLink/RelativeLink.sh |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR
commit 6a581a2b05666d13e5c87144f4d6aa2fb77cb68a Author: Georg Koppen ge...@getfoxyproxy.org Date: Wed Nov 27 20:50:23 2013 -0800 Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR Only bump the version for FF24 builds for now. --- gitian/fetch-inputs.sh | 19 --- gitian/versions.alpha |4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 82a0b50..5831002 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,6 +99,12 @@ update_git() { fi } +checkout_mingw() { + svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 + # XXX: Path + ZIPOPTS=-x*/.svn/* faketime -f 2000-01-01 00:00:00 $WRAPPER_DIR/build-helpers/dzip.sh mingw-w64-svn-snapshot.zip mingw-w64-svn +} + ## # Get package files from mirror @@ -173,9 +179,16 @@ wget -U -N ${NOSCRIPT_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; then - svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 - # XXX: Path - ZIPOPTS=-x*/.svn/* faketime -f 2000-01-01 00:00:00 $WRAPPER_DIR/build-helpers/dzip.sh mingw-w64-svn-snapshot.zip mingw-w64-svn + checkout_mingw +else + # We do have mingw-w64 already but is it the correct revision? We check the + # hash of the zip archive as it has to be changed as well if a new revision + # should be used. + if ! echo ${MINGW_HASH} ${MINGW_PACKAGE} | sha256sum -c -; then + # We need to update the local mingw-w64 copy + rm -rf mingw-w64-svn* + checkout_mingw + fi fi # Verify packages with weak or no signatures via direct sha256 check diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3649fe7..ab6e9cb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,7 +12,7 @@ HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=5830 +MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 @@ -38,7 +38,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b +MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 765b39dd16a7ac0cf16d178e474041897a8fe5ce Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 11:45:56 2013 + Update translations for https_everywhere_completed --- id/https-everywhere.dtd |4 1 file changed, 4 insertions(+) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index 1da792f..ca7aace 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -40,3 +40,7 @@ !ENTITY https-everywhere.popup.paragraph3 Kami menyukainya jika kamu tetep terus menggunakan rilis pengembangan kami dan membantu kami membuat HTTPS Everywhere lebih baik! Kamu mungkin menemukan beberapa kutu lagi disini dan disana, dimana kamu dapat melaporkannya ke https-everywh...@eff.org. Maaf atas ketidaknyamanannya, dan terima kasih telah menggunakan HTTPS Everywhere. !ENTITY https-everywhere.popup.keep Tetapkan saya di versi pengembangan !ENTITY https-everywhere.popup.revert Unduh versi stabil terakhir + +!ENTITY https-everywhere.ruleset-tests.status_title Pengujian aturan HTTPS Everywhere +!ENTITY https-everywhere.ruleset-tests.status_cancel_button Batal +!ENTITY https-everywhere.ruleset-tests.status_start_button Mulai ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 5327de3c7cd97dba02ea2ec938d0f09f4c01d84d Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 11:45:51 2013 + Update translations for https_everywhere --- id/https-everywhere.dtd |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index b13f015..ca7aace 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -41,6 +41,6 @@ !ENTITY https-everywhere.popup.keep Tetapkan saya di versi pengembangan !ENTITY https-everywhere.popup.revert Unduh versi stabil terakhir -!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere Ruleset Tests +!ENTITY https-everywhere.ruleset-tests.status_title Pengujian aturan HTTPS Everywhere !ENTITY https-everywhere.ruleset-tests.status_cancel_button Batal -!ENTITY https-everywhere.ruleset-tests.status_start_button Start +!ENTITY https-everywhere.ruleset-tests.status_start_button Mulai ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha
commit 8449629ae47d24a0a57dcf5d51840d7b26e9fa77 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 12:15:20 2013 + Update translations for vidalia_alpha --- id/vidalia_id.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/vidalia_id.po b/id/vidalia_id.po index 2d5e6db..a506d55 100644 --- a/id/vidalia_id.po +++ b/id/vidalia_id.po @@ -6,7 +6,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: translati...@vidalia-project.net\n POT-Creation-Date: 2012-03-21 17:46+\n -PO-Revision-Date: 2013-11-12 09:41+\n +PO-Revision-Date: 2013-12-02 12:00+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n MIME-Version: 1.0\n @@ -1974,7 +1974,7 @@ msgstr msgctxt MainWindow msgid Restart -msgstr +msgstr Muat ulang msgctxt MainWindow msgid Reload Tor's config ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit f94da0463dfbbb20372434a6248b635dbbd8e617 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 12:16:03 2013 + Update translations for https_everywhere_completed --- id/https-everywhere.properties |1 + 1 file changed, 1 insertion(+) diff --git a/id/https-everywhere.properties b/id/https-everywhere.properties index 20e88ce..487dd39 100644 --- a/id/https-everywhere.properties +++ b/id/https-everywhere.properties @@ -5,3 +5,4 @@ https-everywhere.menu.noRules = (Halaman ini Tidak Diatur) https-everywhere.menu.unknownRules = (Aturan untuk Halaman ini Tidak Diketahui) https-everywhere.toolbar.hint = HTTPS Everywhere sekarang aktif. Kamu dapat mengaktifkannya berdasarkan site-by-site dengan mengklik ikon dibilah alamat. https-everywhere.migration.notification0 = Dalam rangka mengimplementasikan perbaikan yang krusial, pembaharuan ini menjalankan ulang peraturan preferensi HTTPS Everywhere anda ke nilai bawaannya. +https-everywhere.menu.ruleset-tests = Jalankan pengujian aturan HTTPS Everywhere ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] correctly configure ctypes in cross compilation conditions
commit 824490215a787a0e23854b514e7caa08434b1fdf Author: Nathan Froyd froy...@gmail.com Date: Mon Dec 2 05:12:39 2013 -0800 correctly configure ctypes in cross compilation conditions Just unconditionally export things for Android and everything else. --- js/src/configure.in | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/js/src/configure.in b/js/src/configure.in index 4f1f56d..183b9de 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -4545,16 +4545,9 @@ if test $JS_HAS_CTYPES -a -z $MOZ_NATIVE_FFI; then ac_configure_args=$ac_configure_args --with-pic fi if test $CROSS_COMPILE; then -case $target in -*-android*|*-linuxandroid*) - export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS +export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS - ac_configure_args=$ac_configure_args --build=$build --host=$target HOST_CC=\$HOST_CC\ - ;; -*) - ac_configure_args=$ac_configure_args --build=$build --host=$target HOST_CC=\$HOST_CC\ CC=\$CC\ - ;; -esac +ac_configure_args=$ac_configure_args --build=$build --host=$target HOST_CC=\$HOST_CC\ fi if test $_MSC_VER; then # Use a wrapper script for cl and ml that looks more like gcc. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] Ray's otool patch
commit 88ff5a23f6585f1f9c248082e0f3103e4933b2d2 Author: Georg Koppen g.kop...@jondos.de Date: Tue Nov 12 15:45:50 2013 +0100 Ray's otool patch --- toolkit/library/dependentlibs.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 54e2b86..c8f9d15 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' -proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE) +proc = subprocess.Popen([TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] rebased patch 931043 to avoid breaking 64bit cross-compiled builds due to wrong va_list handling
commit 7167f24fc993ae6f1a3a5ee9800ed2fa9fdc6874 Author: Georg Koppen g.kop...@jondos.de Date: Mon Nov 11 14:01:15 2013 +0100 rebased patch 931043 to avoid breaking 64bit cross-compiled builds due to wrong va_list handling --- configure.in| 69 +++ js/src/configure.in | 68 +++--- 2 files changed, 40 insertions(+), 97 deletions(-) diff --git a/configure.in b/configure.in index ddc813a..7569b26 100644 --- a/configure.in +++ b/configure.in @@ -3416,13 +3416,10 @@ AC_LANG_C dnl ** dnl *** va_copy checks *** -dnl ** -dnl we currently check for all three va_copy possibilities, so we get -dnl all results in config.log for bug reports. -AC_MSG_CHECKING(for an implementation of va_copy()) -AC_CACHE_VAL(ac_cv_va_copy,[ -AC_TRY_RUN([ -#include stdarg.h +AC_CACHE_CHECK([for an implementation of va_copy()], + ac_cv_va_copy, +[AC_TRY_COMPILE([#include stdarg.h + #include stdlib.h void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -3430,37 +3427,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); -} -int main() { f (0, 42); return 0; }], -ac_cv_va_copy=yes, -ac_cv_va_copy=no, -ac_cv_va_copy=no -) -]) -AC_MSG_RESULT($ac_cv_va_copy) -AC_MSG_CHECKING(for an implementation of __va_copy()) -AC_CACHE_VAL(ac_cv___va_copy,[ -AC_TRY_RUN([ -#include stdarg.h -void f (int i, ...) { -va_list args1, args2; -va_start (args1, i); -__va_copy (args2, args1); -if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) -exit (1); -va_end (args1); va_end (args2); -} -int main() { f (0, 42); return 0; }], -ac_cv___va_copy=yes, -ac_cv___va_copy=no, -ac_cv___va_copy=no -) -]) -AC_MSG_RESULT($ac_cv___va_copy) -AC_MSG_CHECKING(whether va_lists can be copied by value) -AC_CACHE_VAL(ac_cv_va_val_copy,[ -AC_TRY_RUN([ -#include stdarg.h +}], +[f(0, 42); return 0], +[ac_cv_va_copy=yes], +[ac_cv_va_copy=no] +)] +) +AC_CACHE_CHECK([whether va_list can be copied by value], + ac_cv_va_val_copy, +[AC_TRY_COMPILE([#include stdarg.h + #include stdlib.h void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -3468,25 +3444,20 @@ AC_CACHE_VAL(ac_cv_va_val_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); -} -int main() { f (0, 42); return 0; }], -ac_cv_va_val_copy=yes, -ac_cv_va_val_copy=no, -ac_cv_va_val_copy=yes -) -]) +}], +[f(0, 42); return 0], +[ac_cv_va_val_copy=yes], +[ac_cv_va_val_copy=no], +)] +) if test x$ac_cv_va_copy = xyes; then AC_DEFINE(VA_COPY, va_copy) AC_DEFINE(HAVE_VA_COPY) -elif test x$ac_cv___va_copy = xyes; then -AC_DEFINE(VA_COPY, __va_copy) -AC_DEFINE(HAVE_VA_COPY) fi if test x$ac_cv_va_val_copy = xno; then AC_DEFINE(HAVE_VA_LIST_AS_ARRAY) fi -AC_MSG_RESULT($ac_cv_va_val_copy) dnl === dnl diff --git a/js/src/configure.in b/js/src/configure.in index 183b9de..46a076c 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -2778,12 +2778,10 @@ AC_LANG_C dnl ** dnl *** va_copy checks *** dnl ** -dnl we currently check for all three va_copy possibilities, so we get -dnl all results in config.log for bug reports. -AC_MSG_CHECKING(for an implementation of va_copy()) -AC_CACHE_VAL(ac_cv_va_copy,[ -AC_TRY_RUN([ -#include stdarg.h +AC_CACHE_CHECK([for an implementation of va_copy()], + ac_cv_va_copy, +[AC_TRY_COMPILE([#include stdarg.h + #include stdlib.h void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -2791,37 +2789,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); -} -int main() { f (0, 42); return 0; }], -ac_cv_va_copy=yes, -ac_cv_va_copy=no, -ac_cv_va_copy=no -) -]) -AC_MSG_RESULT($ac_cv_va_copy) -AC_MSG_CHECKING(for an implementation of __va_copy()) -AC_CACHE_VAL(ac_cv___va_copy,[ -AC_TRY_RUN([ -#include stdarg.h -void f (int i, ...) { -va_list args1, args2; -
[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] new .mozconfig file for the new cross-compiler and ESR24
commit 16836470c4f84f85c86ce140262c1cb6b0b0fa58 Author: Georg Koppen ge...@getfoxyproxy.org Date: Fri Nov 29 15:17:56 2013 +0100 new .mozconfig file for the new cross-compiler and ESR24 --- .mozconfig-mac | 39 +++ 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 79a40fe..25a3f7d 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -1,23 +1,46 @@ -#Specify the cross compile export CROSS_COMPILE=1 -ac_add_options --enable-application=browser -ac_add_options --target=i686-apple-darwin11 -#ac_add_options --enable-default-toolkit=cairo-windows +SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk +ROOTDIR=$HOME/build/x-tools/x86_64-apple-darwin10/bin +FLAGS=-arch i386 -isysroot $SYSROOTDIR + +# Ideally we use the patch provided in +# https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path +# symlinks but for some reason that does not work. While Firefox is not +# complaining with this patch on compile time anymore it won't start... +# CROSS_PRIVATE_FRAMEWORKS=$SYSROOTDIR/System/Library/PrivateFrameworks + +# Needed for our otool patch +TOOLCHAIN_PREFIX=x86_64-apple-darwin10- + +CC=$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS +CXX=$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS + +# We need them as configure is looking for i386-apple-darwin10-* which is not +# existing. +RANLIB=$ROOTDIR/x86_64-apple-darwin10-ranlib +AR=$ROOTDIR/x86_64-apple-darwin10-ar +AS=$ROOTDIR/x86_64-apple-darwin10-as +LD=$ROOTDIR/x86_64-apple-darwin10-ld +STRIP=$ROOTDIR/x86_64-apple-darwin10-strip + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -mk_add_options MOZ_MAKE_FLAGS=-j4 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --disable-debug -ac_add_options --enable-optimize +ac_add_options --target=i386-apple-darwin10 +ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding +ac_add_options --enable-optimize +ac_add_options --disable-debug +# See above for a reason why this is currently disabled +# ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -#ac_add_options --disable-ctypes +# ac_add_options --disable-ctypes ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
commit 63b68e6ecd3db9310561e4240b566b84ac109cb1 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 17:46:12 2013 + Update translations for tor-launcher-properties_completed --- bg/torlauncher.properties | 31 +++ 1 file changed, 31 insertions(+) diff --git a/bg/torlauncher.properties b/bg/torlauncher.properties new file mode 100644 index 000..3cf685a --- /dev/null +++ b/bg/torlauncher.properties @@ -0,0 +1,31 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Ð¢Ð¾Ñ Ð»ÑнÑÐµÑ + +torlauncher.tor_exited=Ð¢Ð¾Ñ ÑпÑÑ Ð¿ÑинÑдиÑелно +torlauncher.please_restart_app=ÐолÑ, ÑеÑÑаÑÑиÑайÑе пÑиложениеÑо. +torlauncher.tor_controlconn_failed=Ð¢Ð¾Ñ Ð½Ñма вÑÑзка Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð½Ð¸Ñ Ð¿Ð¾ÑÑ +torlauncher.tor_failed_to_start=Ð¢Ð¾Ñ Ð½Ðµ ÑÑаÑÑиÑа ÑÑпеÑно +torlauncher.tor_bootstrap_failed=Tor не ÑÑÐ¿Ñ Ð´Ð° ÑÑÑанови вÑÑзка Ñ Tor мÑежаÑа.\n\n%S + +torlauncher.unable_to_start_tor=ÐевÑзможно е да Ñе ÑÑаÑÑиÑа Tor.\n\n%S +torlauncher.tor_missing=ÐÑиложениеÑо Tor липÑва. +torlauncher.torrc_missing=Файла torrc липÑва. +torlauncher.datadir_missing=ÐаÑа диÑекÑоÑиÑÑа на Ð¢Ð¾Ñ Ð½Ðµ ÑÑÑеÑÑвÑва +torlauncher.password_hash_missing=ÐÑоблем Ñ Ð¸Ð·ÑеглÑнеÑо на Ñ ÐµÑиÑани паÑоли. + +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 адÑÐµÑ Ð¸Ð»Ð¸ Ñ Ð¾ÑÑ Ð¸Ð¼Ðµ и Ð½Ð¾Ð¼ÐµÑ Ð½Ð° поÑÑа, за да наÑÑÑоиÑе Ð¢Ð¾Ñ Ð´Ð° използва пÑокÑи доÑÑÑп до инÑеÑнеÑ. +torlauncher.error_proxy_type_missing=ТÑÑбва да избеÑеÑе вида на пÑокÑиÑо. +torlauncher.error_bridges_missing=ТÑÑбва да зададеÑе един или повеÑе бÑиджа + +torlauncher.connect=СвÑÑжи Ñе +torlauncher.quit=ÐÑай +torlauncher.quit_win=ÐÐ·Ñ Ð¾Ð´ +torlauncher.done=ÐоÑово + +torlauncher.forAssistance=Ðа ÑÑдейÑÑвие , Ð¼Ð¾Ð»Ñ ÑвÑÑжеÑе Ñе Ñ %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit bb256fdc8c30b4cf270e8e216a0646edb862f703 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 17:46:18 2013 + Update translations for tails-misc --- bg.po | 55 --- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/bg.po b/bg.po index 6e824c1..35803d3 100644 --- a/bg.po +++ b/bg.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# alexdimitrov kvik...@gmail.com, 2013 msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-10-26 23:41+0200\n -PO-Revision-Date: 2013-11-06 09:01+\n -Last-Translator: runasand runa.sand...@gmail.com\n +POT-Creation-Date: 2013-11-30 16:12+0100\n +PO-Revision-Date: 2013-12-02 17:30+\n +Last-Translator: alexdimitrov kvik...@gmail.com\n Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -131,7 +132,7 @@ msgstr #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid Choose keys -msgstr +msgstr ÐзбеÑеÑе клÑÑове #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid Do you trust these keys? @@ -224,21 +225,21 @@ msgstr msgid About Tails msgstr -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid Your additional software msgstr -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 msgid The upgrade failed. This might be due to a network problem. Please check your network connection, try to restart Tails, or read the system log to understand better the problem. msgstr -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 msgid The upgrade was successful. msgstr @@ -315,79 +316,79 @@ msgid more.../a msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid error: msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid Error msgstr ÐÐ ÐШÐÐ -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67 msgid warning: msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid Warning msgstr Ðнимание -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid Do you really want to launch the Unsafe Browser? msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 msgid Network activity within the Unsafe Browser is bnot anonymous/b. Only use the Unsafe Browser if necessary, for example if you have to login or register to activate your Internet connection. msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:80 msgid _Launch msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 msgid _Exit msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91 msgid Starting the Unsafe Browser... msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid This may take a while, so please be patient. msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110 msgid Failed to setup chroot. msgstr -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid Unsafe Browser msgstr -#:
[tor-commits] [translation/whisperback] Update translations for whisperback
commit 467f4c63e0547ae92ebfd2a923e46550b91c7326 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 18:15:48 2013 + Update translations for whisperback --- bg/bg.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 7b244ea..fe9ae49 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -12,7 +12,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-12-02 17:44+\n +PO-Revision-Date: 2013-12-02 18:00+\n Last-Translator: alexdimitrov kvik...@gmail.com\n Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n MIME-Version: 1.0\n @@ -107,7 +107,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ÐожеÑе да Ñ Ð·Ð°Ð¿Ð°Ð¼ÐµÑиÑе на USB Ð¿Ð°Ð¼ÐµÑ Ð¸ да опиÑаÑе да ни Ñ Ð¸Ð·Ð¿ÑаÑиÑе по мейла на адÑÐµÑ %s. Този оÑÑÐµÑ Ð½Ñма да бÑде анонимен, оÑвен ако не го изпÑаÑиÑе пÑез вÑеменен е-майл акаÑнÑ.\n\nÐÑкаÑе ли да запамеÑиÑе оÑÑеÑа за гÑеÑкаÑа вÑв Ñайл? #: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid WhisperBack @@ -158,7 +158,7 @@ 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 ÑазÑабоÑÑиÑи ta...@boum.org\n\nТази пÑогÑама е Ñвободен ÑоÑÑÑеÑ; можеÑе да Ñ ÑедиÑÑÑибÑÑиÑаÑе и/или пÑоменÑÑе\nÑпÑÑмо GNU лиÑенза, пÑбликÑван Ð¾Ñ Ð¤Ð¾Ð½Ð´Ð°ÑиÑÑа за Свободен СоÑÑÑÐµÑ \n(Free Software Foundation); веÑÑÐ¸Ñ 3 или по-ÑкоÑоÑна.\n\nÐÑогÑамаÑа е диÑÑÑибÑÑиÑана Ñ Ð½Ð°Ð´ÐµÐ¶Ð´Ð°Ñа да бÑде полезна, но ÐÐÐ\nÐÐÐÐÐÐÐ ÐÐÐ ÐÐЦÐЯ; доÑи без коÑвена гаÑанÑÐ¸Ñ Ð·Ð° ÐÐ ÐÐÐÐÐÐÐÐСТ\nили СÐÐСÐÐÐÐСТ ÐÐ ÐÐÐЪÐÐЯÐÐ ÐÐÐ ÐÐÐÐÐÐРЦÐÐ. ÐижÑе GNU \nGeneral Public License за повеÑе инÑоÑмаÑиÑ.\n\nÐи ÑÑÑбвало да ÑÑе полÑÑили копи е на General Public License Ñ Ð¿ÑогÑамаÑа,\nако не - вижÑе http://www.gnu.org/licenses/.\n #: ../data/whisperback.ui.h:20 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] Update translations for whisperback
commit 63441fedfbe41dfdddb7bca657b5e7b2a2550e65 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 21:45:50 2013 + Update translations for whisperback --- pt_BR/pt_BR.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 5f4772b..6bf0594 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,8 +17,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-11-27 22:30+\n -Last-Translator: ebonsi\n +PO-Revision-Date: 2013-12-02 21:33+\n +Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed
commit 9edca4c9ce2c6a5180c09a1cb782b4453cdad9a3 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 21:45:54 2013 + Update translations for whisperback_completed --- pt_BR/pt_BR.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 5f4772b..6bf0594 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,8 +17,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-11-27 22:30+\n -Last-Translator: ebonsi\n +PO-Revision-Date: 2013-12-02 21:33+\n +Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] Update translations for whisperback
commit 9ec97effd897002f71934875f23d2e3b34934bee Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 22:45:47 2013 + Update translations for whisperback --- pt_BR/pt_BR.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 6bf0594..9ed1712 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-12-02 21:33+\n +PO-Revision-Date: 2013-12-02 22:45+\n Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n @@ -63,7 +63,7 @@ msgstr Enviando e-mail #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid This could take a while... -msgstr Isto pode demorar algum tempo... +msgstr Esta tarefa pode demorar algum tempo... #: ../whisperBack/gui.py:237 msgid The contact email adress doesn't seem valid. @@ -163,7 +163,7 @@ 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 Comentários - Envie os seus comentários em um email criptografado para \na href=\mailto:ta...@boum.org\;Copyright (C) 2009-2012 Tails developers./a\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\nnos termos da Licença Pública Geral da GNU, publicado pela\nFree Software Foundation; versão 3 da Licença, ou (à sua escolha) em qualquer\nversão mais recente.\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\nSEM QUALQUER GARANTIA; nem mesmo a garantia implÃcita de\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral da GNU para mais detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral da GNU\njunto com este programa. Caso contrário, consulte os termos \nda a href=\http://www.gnu.org/licenses/\;Licença Pública Geral da GNU/a.\n\n +msgstr WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\n\nnos termos da Licença Pública Geral GNU, tal como publicado pela\n\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\n\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\n\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\n\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\n\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n #: ../data/whisperback.ui.h:20 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed
commit 836f24af23a3ca8f58299fb5fc9f67c69123465a Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 22:45:50 2013 + Update translations for whisperback_completed --- pt_BR/pt_BR.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 6bf0594..9ed1712 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-12-02 21:33+\n +PO-Revision-Date: 2013-12-02 22:45+\n Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n @@ -63,7 +63,7 @@ msgstr Enviando e-mail #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid This could take a while... -msgstr Isto pode demorar algum tempo... +msgstr Esta tarefa pode demorar algum tempo... #: ../whisperBack/gui.py:237 msgid The contact email adress doesn't seem valid. @@ -163,7 +163,7 @@ 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 Comentários - Envie os seus comentários em um email criptografado para \na href=\mailto:ta...@boum.org\;Copyright (C) 2009-2012 Tails developers./a\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\nnos termos da Licença Pública Geral da GNU, publicado pela\nFree Software Foundation; versão 3 da Licença, ou (à sua escolha) em qualquer\nversão mais recente.\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\nSEM QUALQUER GARANTIA; nem mesmo a garantia implÃcita de\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral da GNU para mais detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral da GNU\njunto com este programa. Caso contrário, consulte os termos \nda a href=\http://www.gnu.org/licenses/\;Licença Pública Geral da GNU/a.\n\n +msgstr WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\n\nnos termos da Licença Pública Geral GNU, tal como publicado pela\n\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\n\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\n\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\n\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\n\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n #: ../data/whisperback.ui.h:20 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] Update translations for whisperback
commit c2107bddd2336a37b8a585c64defa9d74ba06837 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 23:15:48 2013 + Update translations for whisperback --- pt_BR/pt_BR.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 9ed1712..ba69428 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-12-02 22:45+\n +PO-Revision-Date: 2013-12-02 23:00+\n Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n @@ -39,7 +39,7 @@ msgstr Key OpenPGP de contato inválida: %s #: ../whisperBack/whisperback.py:82 msgid Invalid contact OpenPGP public key block -msgstr OpenPGP bloco de chave pública de contato inválido +msgstr Bloco de chave pública de contato OpenPGP inválido #: ../whisperBack/exceptions.py:41 #, python-format @@ -163,7 +163,7 @@ 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 WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\n\nnos termos da Licença Pública Geral GNU, tal como publicado pela\n\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\n\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\n\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\n\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\n\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n +msgstr WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\nnos termos da Licença Pública Geral GNU, tal como publicado pela\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n #: ../data/whisperback.ui.h:20 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed
commit 0200f7154d4698b66710d6970e5367455c6e5a34 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 23:15:53 2013 + Update translations for whisperback_completed --- pt_BR/pt_BR.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 9ed1712..ba69428 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-12-02 22:45+\n +PO-Revision-Date: 2013-12-02 23:00+\n Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n @@ -39,7 +39,7 @@ msgstr Key OpenPGP de contato inválida: %s #: ../whisperBack/whisperback.py:82 msgid Invalid contact OpenPGP public key block -msgstr OpenPGP bloco de chave pública de contato inválido +msgstr Bloco de chave pública de contato OpenPGP inválido #: ../whisperBack/exceptions.py:41 #, python-format @@ -163,7 +163,7 @@ 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 WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\n\nnos termos da Licença Pública Geral GNU, tal como publicado pela\n\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\n\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\n\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\n\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\n\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n +msgstr WhisperBack - Envie feedback em um email criptografado\nCopyright (C) 2009-2012 Tails developers ta...@boum.org\n\nEste programa é um software livre. Você pode redistribui-lo e/ou modificá-lo\nnos termos da Licença Pública Geral GNU, tal como publicado pela\nFree Software Foundation, versão 3 da Licença, ou (à sua escolha) qualquer\n versão mais recente.\n\nEste programa é distribuÃdo com a intenção de ser útil, mas\nSEM QUALQUER GARANTIA, sem nem mesmo a garantia implÃcita de\nCOMERCIALIZAÃÃO OU ADEQUAÃÃO A QUALQUER PROPÃSITO PARTICULAR.\nConsulte a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\njunto com este programa. Caso contrário, consulte http://www.gnu.org/licenses/.\n\n #: ../data/whisperback.ui.h:20 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26444: {website} say when they got posted so people know they're recent (for (website/trunk/about/en)
Author: arma Date: 2013-12-02 23:20:42 + (Mon, 02 Dec 2013) New Revision: 26444 Modified: website/trunk/about/en/jobs-browserhacker.wml website/trunk/about/en/jobs-extdev.wml Log: say when they got posted so people know they're recent (for now) Modified: website/trunk/about/en/jobs-browserhacker.wml === --- website/trunk/about/en/jobs-browserhacker.wml 2013-12-02 23:16:05 UTC (rev 26443) +++ website/trunk/about/en/jobs-browserhacker.wml 2013-12-02 23:20:42 UTC (rev 26444) @@ -11,6 +11,7 @@ /div div id=maincol h1The Tor Project is looking for a Browser Hacker!/h1 +h2(Posted 22 Nov 2013)/h2 p Modified: website/trunk/about/en/jobs-extdev.wml === --- website/trunk/about/en/jobs-extdev.wml 2013-12-02 23:16:05 UTC (rev 26443) +++ website/trunk/about/en/jobs-extdev.wml 2013-12-02 23:20:42 UTC (rev 26444) @@ -11,6 +11,7 @@ /div div id=maincol h1The Tor Project is looking for a Firefox/Thunderbird Extension Developer!/h1 +h2(Posted 22 Nov 2013)/h2 p ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor] Update translations for gettor
commit ef6b7ed39cee4b600799d94f852005a8983e6849 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 23:45:05 2013 + Update translations for gettor --- pt_BR/gettor.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index de70fdb..7712287 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -14,8 +14,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-01-19 13:40+0100\n -PO-Revision-Date: 2013-11-26 19:40+\n -Last-Translator: ebonsi\n +PO-Revision-Date: 2013-12-02 23:40+\n +Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -43,7 +43,7 @@ msgid We only process requests from email services that support \DKIM\,\n which is an email feature that lets us verify that the address in the\n \From\ line is actually the one who sent the mail. -msgstr Nós processamos somente os pedidos vindos de serviços de e-mail que\napóiem \DKIM\, uma funcionalidade de e-mail que nos permite verificar se o endereço na linha \De\ é realmente o mesmo daquele do qual o e-mail foi enviado. +msgstr Nós processamos somente os pedidos vindos de serviços de e-mail que\napóiem \DKIM\, uma funcionalidade de e-mail que nos permite verificar se o endereço na linha \De\ é realmente o mesmo que aquele do qual o e-mail foi enviado. #: lib/gettor/i18n.py:39 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] Update translations for torcheck
commit 119fce34ca3a3b335e4e81be7c200a5c741fe134 Author: Translation commit bot translat...@torproject.org Date: Mon Dec 2 23:45:49 2013 + Update translations for torcheck --- pt_BR/torcheck.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index 3cdc603..bc8d91c 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -11,8 +11,8 @@ msgid msgstr Project-Id-Version: The Tor Project\n POT-Creation-Date: 2012-02-16 20:28+PDT\n -PO-Revision-Date: 2013-11-26 19:50+\n -Last-Translator: ebonsi\n +PO-Revision-Date: 2013-12-02 23:40+\n +Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -22,7 +22,7 @@ msgstr Plural-Forms: nplurals=2; plural=(n 1);\n msgid Congratulations. Your browser is configured to use Tor. -msgstr Parabéns. O seu navegador está configurado para usar o Tor. +msgstr Parabéns. O seu navegador está configurado para usar Tor. msgid Please refer to the a href=\https://www.torproject.org/\;Tor website/a ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor_completed] Update translations for gettor_completed
commit 6541932c51a2d3a9c38ed7b22bb1683585e7795e Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 00:15:09 2013 + Update translations for gettor_completed --- pt_BR/gettor.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 7712287..d8acac8 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -14,7 +14,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-01-19 13:40+0100\n -PO-Revision-Date: 2013-12-02 23:40+\n +PO-Revision-Date: 2013-12-02 23:50+\n Last-Translator: Communia ameanean...@riseup.net\n Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n MIME-Version: 1.0\n ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] Update translations for whisperback
commit 285a53663cd2e6c0d6738f7b3a6e4c0960ffeee3 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 04:45:47 2013 + Update translations for whisperback --- ru@petr1708/r...@petr1708.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ru@petr1708/r...@petr1708.po b/ru@petr1708/r...@petr1708.po index f4ac861..7b07560 100644 --- a/ru@petr1708/r...@petr1708.po +++ b/ru@petr1708/r...@petr1708.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bergitte alvina_alexandr...@mail.ru, 2013 msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n; +Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-01 15:36+0200\n -PO-Revision-Date: 2013-09-16 17:15+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2013-12-03 04:45+\n +Last-Translator: Bergitte alvina_alexandr...@mail.ru\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -83,7 +84,7 @@ msgstr #: ../whisperBack/gui.py:274 msgid Your message has been sent. -msgstr +msgstr ÐаÑе пиÑÑмо бÑло оÑпÑавлено. #: ../whisperBack/gui.py:281 msgid An error occured during encryption. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor] Update translations for gettor
commit 7587b066f68609bad67d6c54b27245bde1b2d061 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 05:45:04 2013 + Update translations for gettor --- ru@petr1708/gettor.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ru@petr1708/gettor.po b/ru@petr1708/gettor.po index 9a9d75c..458177c 100644 --- a/ru@petr1708/gettor.po +++ b/ru@petr1708/gettor.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bergitte alvina_alexandr...@mail.ru, 2013 msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n; +Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-01-19 13:40+0100\n -PO-Revision-Date: 2013-09-16 17:15+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2013-12-03 05:40+\n +Last-Translator: Bergitte alvina_alexandr...@mail.ru\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -23,7 +24,7 @@ msgstr #: lib/gettor/i18n.py:29 msgid Thank you for your request. -msgstr +msgstr СпаÑибо за ÐÐ°Ñ Ð·Ð°Ð¿ÑоÑ. #: lib/gettor/i18n.py:31 msgid @@ -103,7 +104,7 @@ msgstr #: lib/gettor/i18n.py:78 msgid Here is a list of all available languages: -msgstr +msgstr СпиÑок доÑÑÑпнÑÑ ÑзÑков: #: lib/gettor/i18n.py:80 msgid ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia] Update translations for vidalia
commit f58d89b61326fd8c32f0cdecda7c1e382df60277 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 05:45:13 2013 + Update translations for vidalia --- ru@petr1708/vidalia...@petr1708.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru@petr1708/vidalia...@petr1708.po b/ru@petr1708/vidalia...@petr1708.po index fc9dbdf..2859539 100644 --- a/ru@petr1708/vidalia...@petr1708.po +++ b/ru@petr1708/vidalia...@petr1708.po @@ -5,7 +5,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+\n -PO-Revision-Date: 2013-09-16 17:15+\n +PO-Revision-Date: 2013-12-03 05:40+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -3695,7 +3695,7 @@ msgstr msgctxt UpdatesAvailableDialog msgid Version -msgstr +msgstr ÐеÑÑÐ¸Ñ msgctxt VMessageBox msgid OK ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit e970aa218472b58a23cbc26515802866acbcb541 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 05:45:56 2013 + Update translations for https_everywhere --- ru@petr1708/https-everywhere.dtd |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru@petr1708/https-everywhere.dtd b/ru@petr1708/https-everywhere.dtd index 33cd86d..09a4309 100644 --- a/ru@petr1708/https-everywhere.dtd +++ b/ru@petr1708/https-everywhere.dtd @@ -1,7 +1,7 @@ !ENTITY https-everywhere.about.title About HTTPS Everywhere !ENTITY https-everywhere.about.ext_name HTTPS Everywhere !ENTITY https-everywhere.about.ext_description Encrypt the Web! Automatically use HTTPS security on many sites. -!ENTITY https-everywhere.about.version Version +!ENTITY https-everywhere.about.version ÐеÑÑÐ¸Ñ !ENTITY https-everywhere.about.created_by Created by !ENTITY https-everywhere.about.librarians Ruleset Librarians !ENTITY https-everywhere.about.thanks Thanks to @@ -30,8 +30,8 @@ !ENTITY https-everywhere.prefs.reset_default Reset to Default !ENTITY https-everywhere.prefs.view_xml_source View XML Source -!ENTITY https-everywhere.source.downloading Downloading -!ENTITY https-everywhere.source.filename Filename +!ENTITY https-everywhere.source.downloading ÐагÑÑзка +!ENTITY https-everywhere.source.filename ÐÐ¼Ñ Ñайла !ENTITY https-everywhere.source.unable_to_download Unable to download source. !ENTITY https-everywhere.popup.title HTTPS Everywhere 4.0development.11 notification ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha
commit ebbbc34fd3d0612ea6247feb7e74ae11028b70d6 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 05:45:18 2013 + Update translations for vidalia_alpha --- ru@petr1708/vidalia...@petr1708.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru@petr1708/vidalia...@petr1708.po b/ru@petr1708/vidalia...@petr1708.po index 42a503f..d91e89a 100644 --- a/ru@petr1708/vidalia...@petr1708.po +++ b/ru@petr1708/vidalia...@petr1708.po @@ -3,9 +3,9 @@ msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n; +Report-Msgid-Bugs-To: translati...@vidalia-project.net\n POT-Creation-Date: 2012-03-21 17:46+\n -PO-Revision-Date: 2013-09-16 17:15+\n +PO-Revision-Date: 2013-12-03 05:40+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -3782,7 +3782,7 @@ msgstr msgctxt UpdatesAvailableDialog msgid Version -msgstr +msgstr ÐеÑÑÐ¸Ñ msgctxt VMessageBox msgid OK ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] Update translations for mat-gui
commit e2edf7faf5031c5c3c736780511a2b9bbe3f14c4 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 05:46:10 2013 + Update translations for mat-gui --- r...@petr1708.po |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/r...@petr1708.po b/r...@petr1708.po index 6a4545b..0eed188 100644 --- a/r...@petr1708.po +++ b/r...@petr1708.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n; POT-Creation-Date: 2013-07-01 19:26+0200\n -PO-Revision-Date: 2013-09-16 17:15+\n +PO-Revision-Date: 2013-12-03 05:40+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -92,7 +93,7 @@ msgstr #: mat-gui:354 data/mat.ui:291 msgid Filename -msgstr +msgstr ÐÐ¼Ñ Ñайла #: mat-gui:356 msgid Mimetype ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia] Update translations for vidalia
commit 5611c57a20f3b09f4f4f99391a10d2931f37cb4c Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:15:11 2013 + Update translations for vidalia --- ru@petr1708/vidalia...@petr1708.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru@petr1708/vidalia...@petr1708.po b/ru@petr1708/vidalia...@petr1708.po index 2859539..186149e 100644 --- a/ru@petr1708/vidalia...@petr1708.po +++ b/ru@petr1708/vidalia...@petr1708.po @@ -5,7 +5,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+\n -PO-Revision-Date: 2013-12-03 05:40+\n +PO-Revision-Date: 2013-12-03 06:10+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -2588,11 +2588,11 @@ msgstr msgctxt NetworkPage msgid Password: -msgstr +msgstr ÐаÑолÑ: msgctxt NetworkPage msgid Port: -msgstr +msgstr ÐоÑÑ: msgctxt NetworkPage msgid Check to only connect to relays using ports allowed by your firewall @@ -3707,11 +3707,11 @@ msgstr msgctxt VMessageBox msgid Yes -msgstr +msgstr Ðа msgctxt VMessageBox msgid No -msgstr +msgstr ÐÐµÑ msgctxt VMessageBox msgid Help ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha
commit 26ba42c5fa6b7f57410a73ac0559a7c577387d90 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:15:16 2013 + Update translations for vidalia_alpha --- ru@petr1708/vidalia...@petr1708.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru@petr1708/vidalia...@petr1708.po b/ru@petr1708/vidalia...@petr1708.po index d91e89a..0868219 100644 --- a/ru@petr1708/vidalia...@petr1708.po +++ b/ru@petr1708/vidalia...@petr1708.po @@ -5,7 +5,7 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: translati...@vidalia-project.net\n POT-Creation-Date: 2012-03-21 17:46+\n -PO-Revision-Date: 2013-12-03 05:40+\n +PO-Revision-Date: 2013-12-03 06:10+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -2573,11 +2573,11 @@ msgstr msgctxt NetworkPage msgid Password: -msgstr +msgstr ÐаÑолÑ: msgctxt NetworkPage msgid Port: -msgstr +msgstr ÐоÑÑ: msgctxt NetworkPage msgid Check to only connect to relays using ports allowed by your firewall @@ -3794,11 +3794,11 @@ msgstr msgctxt VMessageBox msgid Yes -msgstr +msgstr Ðа msgctxt VMessageBox msgid No -msgstr +msgstr ÐÐµÑ msgctxt VMessageBox msgid Help ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
commit d5fef5ccfa3dc92c5ee921c488ed2be4b80ca590 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:16:02 2013 + Update translations for tails-greeter --- ru@petr1708/r...@petr1708.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru@petr1708/r...@petr1708.po b/ru@petr1708/r...@petr1708.po index a1d5393..86e6f8e 100644 --- a/ru@petr1708/r...@petr1708.po +++ b/ru@petr1708/r...@petr1708.po @@ -6,9 +6,9 @@ msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n; -POT-Creation-Date: 2013-05-12 19:29+0200\n -PO-Revision-Date: 2013-09-16 17:15+\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2013-11-22 13:49+0100\n +PO-Revision-Date: 2013-12-03 06:10+\n Last-Translator: runasand runa.sand...@gmail.com\n Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n MIME-Version: 1.0\n @@ -35,11 +35,11 @@ msgstr #: ../glade/persistencewindow.glade.h:5 msgid Yes -msgstr +msgstr Ðа #: ../glade/persistencewindow.glade.h:6 msgid No -msgstr +msgstr ÐÐµÑ #: ../glade/persistencewindow.glade.h:7 msgid Passphrase: @@ -69,7 +69,7 @@ msgstr #: ../glade/optionswindow.glade.h:6 msgid Password: -msgstr +msgstr ÐаÑолÑ: #: ../glade/optionswindow.glade.h:7 msgid Verify Password: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 44876f906e9d5d66264b629790d5ddf905179e09 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:15:54 2013 + Update translations for https_everywhere --- ru@petr1708/ssl-observatory.dtd | 75 ++- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/ru@petr1708/ssl-observatory.dtd b/ru@petr1708/ssl-observatory.dtd index d832b69..c8acfc5 100644 --- a/ru@petr1708/ssl-observatory.dtd +++ b/ru@petr1708/ssl-observatory.dtd @@ -1,9 +1,11 @@ !-- Observatory popup window -- -!ENTITY ssl-observatory.popup.details -!ENTITY ssl-observatory.popup.later -!ENTITY ssl-observatory.popup.no +!ENTITY ssl-observatory.popup.details Details and Privacy Information +!ENTITY ssl-observatory.popup.later Ask Me Later +!ENTITY ssl-observatory.popup.no ÐÐµÑ -!ENTITY ssl-observatory.popup.text +!ENTITY ssl-observatory.popup.text HTTPS Everywhere can detect attacks +against your browser by sending the certificates you receive to the +Observatory. Turn this on? !--!ENTITY ssl-observatory.popup.text EFF's SSL Observatory can detect attacks against HTTPS websites by collecting @@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like to turn it on?-- !ENTITY ssl-observatory.popup.title - +Should HTTPS Everywhere use the SSL Observatory? -!ENTITY ssl-observatory.popup.yes +!ENTITY ssl-observatory.popup.yes Ðа !-- Observatory preferences dialog -- !ENTITY ssl-observatory.prefs.adv_priv_opts1 - +It is safe to enable this, unless you use a very +intrusive corporate network: !ENTITY ssl-observatory.prefs.adv_priv_opts2 - +Safe, unless you use a corporate network with secret intranet server names: !ENTITY ssl-observatory.prefs.alt_roots - +Submit and check certificates signed by non-standard root CAs !ENTITY ssl-observatory.prefs.alt_roots_tooltip - +It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default. -!ENTITY ssl-observatory.prefs.anonymous +!ENTITY ssl-observatory.prefs.anonymous Check certificates using Tor for anonymity !ENTITY ssl-observatory.prefs.anonymous_unavailable - +Check certificates using Tor for anonymity (requires Tor) !ENTITY ssl-observatory.prefs.anonymous_tooltip - +This option requires Tor to be installed and running !ENTITY ssl-observatory.prefs.asn - +When you see a new certificate, tell the Observatory which ISP you are connected to !ENTITY ssl-observatory.prefs.asn_tooltip - +This will fetch and send the quot;Autonomous System numberquot; of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common. -!ENTITY ssl-observatory.prefs.done +!ENTITY ssl-observatory.prefs.done Done !ENTITY ssl-observatory.prefs.explanation - +HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) +sends copies of HTTPS certificates to the Observatory, to help us +detect 'man in the middle' attacks and improve the Web's security; and (2) +lets us warn you about insecure connections or attacks on your browser. !--!ENTITY ssl-observatory.prefs.explanation2 When you visit https://www.example.com, the Observatory will learn that @@ -53,34 +59,37 @@ Mouseover the options for further details:-- !ENTITY ssl-observatory.prefs.explanation2 - +For example, when you visit https://www.something.com, the certificate +received by the Observatory will indicate that somebody visited +www.something.com, but not who visited the site, or what specific page they +looked at. Mouseover the options for further details: -!ENTITY ssl-observatory.prefs.hide +!ENTITY ssl-observatory.prefs.hide Hide advanced options !ENTITY ssl-observatory.prefs.nonanon - +Check certificates even if Tor is not available !ENTITY ssl-observatory.prefs.nonanon_tooltip - +We will still try to keep the data anonymous, but this option is less secure !ENTITY ssl-observatory.prefs.priv_dns - +Submit and check certificates for non-public DNS names !ENTITY ssl-observatory.prefs.priv_dns_tooltip - +Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system. -!ENTITY ssl-observatory.prefs.show +!ENTITY ssl-observatory.prefs.show Show advanced options -!ENTITY ssl-observatory.prefs.title +!ENTITY ssl-observatory.prefs.title SSL Observatory Preferences -!ENTITY ssl-observatory.prefs.use -!ENTITY ssl-observatory.warning.title -!ENTITY ssl-observatory.warning.showcert
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 586d696f690d312c6be7513543c48b0780c068b6 Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:16:15 2013 + Update translations for tor-launcher-network-settings --- ru@petr1708/network-settings.dtd | 90 +++--- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/ru@petr1708/network-settings.dtd b/ru@petr1708/network-settings.dtd index 6ce1473..41c36b4 100644 --- a/ru@petr1708/network-settings.dtd +++ b/ru@petr1708/network-settings.dtd @@ -1,55 +1,55 @@ -!ENTITY torsettings.dialog.title +!ENTITY torsettings.dialog.title Tor Network Settings !-- For first run wizard: -- -!ENTITY torsettings.prompt +!ENTITY torsettings.prompt Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection. -!ENTITY torSettings.yes -!ENTITY torSettings.no +!ENTITY torSettings.yes Ðа +!ENTITY torSettings.no ÐÐµÑ -!ENTITY torSettings.firstQuestion -!ENTITY torSettings.configurePrompt1 -!ENTITY torSettings.configurePrompt2 -!ENTITY torSettings.configure -!ENTITY torSettings.connectPrompt1 -!ENTITY torSettings.connectPrompt2 -!ENTITY torSettings.connect +!ENTITY torSettings.firstQuestion Which of the following best describes your situation? +!ENTITY torSettings.configurePrompt1 This computer's Internet connection is censored, filtered, or proxied. +!ENTITY torSettings.configurePrompt2 I need to configure network settings. +!ENTITY torSettings.configure Configure +!ENTITY torSettings.connectPrompt1 This computer's Internet connection is clear of obstacles. +!ENTITY torSettings.connectPrompt2 I would like to connect directly to the Tor network. +!ENTITY torSettings.connect Connect -!ENTITY torSettings.proxyQuestion +!ENTITY torSettings.proxyQuestion Does this computer need to use a proxy to access the Internet? !-- see https://www.torproject.org/docs/proxychain.html.en -- -!ENTITY torSettings.proxyHelp -!ENTITY torSettings.enterProxy -!ENTITY torSettings.firewallQuestion -!ENTITY torSettings.firewallHelp -!ENTITY torSettings.enterFirewall -!ENTITY torSettings.bridgeQuestion +!ENTITY torSettings.proxyHelp If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy. +!ENTITY torSettings.enterProxy Enter the proxy settings. +!ENTITY torSettings.firewallQuestion Does this computer's Internet connection go through a firewall that only allows connections to certain ports? +!ENTITY torSettings.firewallHelp If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting. +!ENTITY torSettings.enterFirewall Enter a comma-separated list of ports that are allowed by the firewall. +!ENTITY torSettings.bridgeQuestion If this computer's Internet connection is censored, you will need to obtain and use bridge relays.amp;#160; If not, just click Connect. !-- Other: -- -!ENTITY torsettings.startingTor -!ENTITY torsettings.restart - -!ENTITY torsettings.optional - -!ENTITY torsettings.useProxy.checkbox -!ENTITY torsettings.useProxy.type -!ENTITY torsettings.useProxy.address -!ENTITY torsettings.useProxy.address.placeholder -!ENTITY torsettings.useProxy.port -!ENTITY torsettings.useProxy.username -!ENTITY torsettings.useProxy.password -!ENTITY torsettings.useProxy.type.socks4 -!ENTITY torsettings.useProxy.type.socks5 -!ENTITY torsettings.useProxy.type.http -!ENTITY torsettings.firewall.checkbox -!ENTITY torsettings.firewall.allowedPorts -!ENTITY torsettings.useBridges.checkbox -!ENTITY torsettings.useBridges.label -!ENTITY torsettings.useBridges.placeholder - -!ENTITY torsettings.copyLog -!ENTITY torsettings.bridgeHelpTitle -!ENTITY torsettings.bridgeHelp1 -!ENTITY torsettings.bridgeHelp2 -!ENTITY torsettings.bridgeHelp3 -!ENTITY torsettings.bridgeHelp4 +!ENTITY torsettings.startingTor Waiting for Tor to start⦠+!ENTITY torsettings.restart Restart + +!ENTITY torsettings.optional Optional + +!ENTITY torsettings.useProxy.checkbox This computer needs to use a proxy to access the Internet +!ENTITY torsettings.useProxy.type Proxy Type: +!ENTITY torsettings.useProxy.address Address: +!ENTITY torsettings.useProxy.address.placeholder IP address or hostname +!ENTITY torsettings.useProxy.port ÐоÑÑ: +!ENTITY torsettings.useProxy.username Username: +!ENTITY torsettings.useProxy.password ÐаÑолÑ: +!ENTITY torsettings.useProxy.type.socks4 SOCKS 4 +!ENTITY torsettings.useProxy.type.socks5 SOCKS 5 +!ENTITY torsettings.useProxy.type.http HTTP / HTTPS +!ENTITY torsettings.firewall.checkbox This computer goes through a firewall that only allows connections to certain ports +!ENTITY torsettings.firewall.allowedPorts Allowed Ports: +!ENTITY torsettings.useBridges.checkbox My Internet Service Provider (ISP) blocks connections to the Tor network +!ENTITY
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 97c85957e3f780ff81485128b9a3a3f2a6a89f7e Author: Translation commit bot translat...@torproject.org Date: Tue Dec 3 06:16:29 2013 + Update translations for torbutton-torbuttondtd --- ru@petr1708/torbutton.dtd | 300 ++--- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/ru@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd index 2bc5bac..5d1ac26 100644 --- a/ru@petr1708/torbutton.dtd +++ b/ru@petr1708/torbutton.dtd @@ -1,150 +1,150 @@ -!ENTITY torbutton.prefs.title -!ENTITY torbutton.prefs.tor_settings -!ENTITY torbutton.prefs.recommended_settings -!ENTITY torbutton.prefs.use_privoxy -!ENTITY torbutton.prefs.use_polipo -!ENTITY torbutton.prefs.custom_settings -!ENTITY torbutton.prefs.proxy.host.http -!ENTITY torbutton.prefs.proxy.host.https -!ENTITY torbutton.prefs.proxy.host.ftp -!ENTITY torbutton.prefs.proxy.host.gopher -!ENTITY torbutton.prefs.proxy.host.socks -!ENTITY torbutton.prefs.proxy.port -!ENTITY torbutton.about.title -!ENTITY torbutton.about.version -!ENTITY torbutton.about.summary -!ENTITY torbutton.about.code -!ENTITY torbutton.about.maintainer -!ENTITY torbutton.about.security_review -!ENTITY torbutton.about.donate -!ENTITY torbutton.about.make_donation -!ENTITY torbutton.pref_connection.notice -!ENTITY torbutton.pref_connection.more_info -!ENTITY torbutton.pref_connection_more_info.title -!ENTITY torbutton.pref_connection_more_info.text -!ENTITY torbutton.context_menu.new_identity -!ENTITY torbutton.context_menu.new_identity_key -!ENTITY torbutton.context_menu.toggle -!ENTITY torbutton.context_menu.toggle.key -!ENTITY torbutton.context_menu.preferences -!ENTITY torbutton.context_menu.preferences.key -!ENTITY torbutton.context_menu.about -!ENTITY torbutton.context_menu.about.key -!ENTITY torbutton.context_menu.networksettings -!ENTITY torbutton.context_menu.networksettings.key -!ENTITY torbutton.context_menu.downloadUpdate -!ENTITY torbutton.context_menu.downloadUpdate.key -!ENTITY torbutton.context_menu.cookieProtections -!ENTITY torbutton.context_menu.cookieProtections.key -!ENTITY torbutton.context_menu.copyTor -!ENTITY torbutton.context_menu.copyTor.key -!ENTITY torbutton.context_menu.openTorTab -!ENTITY torbutton.context_menu.openTorTab.key -!ENTITY torbutton.context_menu.openTorWindow -!ENTITY torbutton.context_menu.openTorWindow.key -!ENTITY torbutton.button.label -!ENTITY torbutton.button.tooltip -!ENTITY torbutton.prefs.sec_settings -!ENTITY torbutton.prefs.block_thread -!ENTITY torbutton.prefs.block_thwrite -!ENTITY torbutton.prefs.block_nthread -!ENTITY torbutton.prefs.block_nthwrite -!ENTITY torbutton.prefs.clear_history -!ENTITY torbutton.prefs.clear_cache -!ENTITY torbutton.prefs.block_cache -!ENTITY torbutton.prefs.cookie_jars -!ENTITY torbutton.prefs.cookie_protection -!ENTITY torbutton.prefs.mmm_cookies -!ENTITY torbutton.prefs.clear_cookies -!ENTITY torbutton.prefs.disable_plugins -!ENTITY torbutton.prefs.kill_bad_js -!ENTITY torbutton.prefs.isolate_content -!ENTITY torbutton.prefs.no_updates -!ENTITY torbutton.prefs.set_uagent -!ENTITY torbutton.prefs.dynamic -!ENTITY torbutton.prefs.cookies -!ENTITY torbutton.prefs.cache -!ENTITY torbutton.prefs.history -!ENTITY torbutton.prefs.no_search -!ENTITY torbutton.prefs.shutdown -!ENTITY torbutton.prefs.tor_shutdown -!ENTITY torbutton.prefs.all_shutdown -!ENTITY torbutton.prefs.no_shutdown -!ENTITY torbutton.prefs.disable_sessionstore -!ENTITY torbutton.prefs.headers -!ENTITY torbutton.prefs.spoof_english -!ENTITY torbutton.prefs.refererspoofing -!ENTITY torbutton.prefs.spoofblank -!ENTITY torbutton.prefs.smartspoof -!ENTITY torbutton.prefs.nospoof -!ENTITY torbutton.prefs.disable_domstorage -!ENTITY torbutton.prefs.forms -!ENTITY torbutton.prefs.block_tforms -!ENTITY torbutton.prefs.block_ntforms -!ENTITY torbutton.prefs.tor -!ENTITY torbutton.prefs.non_tor -!ENTITY torbutton.prefs.restore_tor -!ENTITY torbutton.prefs.startup_tor -!ENTITY torbutton.prefs.reload_crashed_jar -!ENTITY torbutton.prefs.dual_cookie_jars -!ENTITY torbutton.prefs.clear_http_auth -!ENTITY torbutton.prefs.block_js_history -!ENTITY torbutton.prefs.resize_on_toggle -!ENTITY torbutton.prefs.close_tor -!ENTITY torbutton.prefs.close_nontor -!ENTITY torbutton.prefs.block_links -!ENTITY torbutton.prefs.jar_certs -!ENTITY torbutton.prefs.jar_ca_certs -!ENTITY torbutton.prefs.locked_mode -!ENTITY torbutton.prefs.startup_state -!ENTITY torbutton.prefs.shutdown_state -!ENTITY torbutton.prefs.startup -!ENTITY torbutton.prefs.block_tor_file_net -!ENTITY torbutton.prefs.block_nontor_file_net -!ENTITY torbutton.prefs.restore_defaults -!ENTITY torbutton.prefs.test_settings -!ENTITY torbutton.prefs.test_auto -!ENTITY torbutton.prefs.disable_livemarks -!ENTITY torbutton.prefs.tor_memory_jar -!ENTITY torbutton.prefs.nontor_memory_jar -!ENTITY torbutton.prefs.session_restore -!ENTITY
[tor-commits] [check/master] Add some useful resources
commit 5b491c196e9267f0f072b0e2f5af6d98530c8153 Author: Arlo Breault arlo...@gmail.com Date: Mon Dec 2 22:30:41 2013 -0800 Add some useful resources * Short User Manual * Tor QA Site Closes #19 --- check.pot | 12 public/base.html | 12 public/index.html |8 utils.go | 29 + 4 files changed, 61 insertions(+) diff --git a/check.pot b/check.pot index 5270b42..6bb9e11 100644 --- a/check.pot +++ b/check.pot @@ -68,3 +68,15 @@ msgstr msgid Go msgstr + +msgid Short User Manual +msgstr + +msgid The short user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. +msgstr + +msgid Tor QA Site +msgstr + +msgid Questions and answers site for researchers, developers, and users of Tor. Hosted on StackExchange. Currently only available in English. +msgstr diff --git a/public/base.html b/public/base.html index 20f2c05..f4dc22a 100644 --- a/public/base.html +++ b/public/base.html @@ -56,6 +56,7 @@ } .foot { padding: 2em 4em; + clear: both; } .head { background-color: #85559f; @@ -66,6 +67,17 @@ margin: 0; font-size: 0.8em; } +.other { + width: 50%; + float: left; +} +.other p { + margin: 1em 4em; +} +.other p a { + display: block; + margin-bottom: 0.4em; +} /style /head body diff --git a/public/index.html b/public/index.html index bc8b48f..9477480 100644 --- a/public/index.html +++ b/public/index.html @@ -40,6 +40,14 @@ {{ GetText .Lang If you are attempting to use a Tor client, please refer to the a href=\https://www.torproject.org/\;Tor website/a and specifically the a href=\https://www.torproject.org/docs/faq#DoesntWork\;instructions for configuring your Tor client/a. | UnEscaped }} {{ end }} /p + div class=other +pa href=https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml{{ GetText .Lang Short User Manual }}/a +{{ GetText .Lang The short user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. }}/p + /div + div class=other +pa href=http://tor.stackexchange.com/;{{ GetText .Lang Tor QA Site }}/a +{{ GetText .Lang Questions and answers site for researchers, developers, and users of Tor. Hosted on StackExchange. Currently only available in English. }}/p + /div {{ end }} {{ define foot }} script diff --git a/utils.go b/utils.go index 8b0bda2..d4912e7 100644 --- a/utils.go +++ b/utils.go @@ -49,6 +49,29 @@ func GetQS(q url.Values, param string, deflt int) (num int, str string) { return } +var HaveManual = map[string]bool{ + ar:true, + zh_CN: true, + cs:true, + nl:true, + en:true, + fa:true, + fr:true, + de:true, + el:true, + hu:true, + it:true, + ja:true, + lv:true, + nb:true, + pl:true, + pt_BR: true, + ru:true, + es:true, + sv:true, + tr:true, +} + func FuncMap(domain *gettext.Domain) template.FuncMap { return template.FuncMap{ UnEscaped: func(x string) interface{} { @@ -69,6 +92,12 @@ func FuncMap(domain *gettext.Domain) template.FuncMap { And: func(a bool, b bool) bool { return a b }, + UserManual: func(lang string) string { + if _, ok := HaveManual[lang]; !ok { + lang = en + } + return lang + }, } } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [check/master] Indicate whether JavaScript is enabled
commit b0f90133753d12250b4714caf807798fc0eec10f Author: Arlo Breault arlo...@gmail.com Date: Mon Dec 2 23:25:26 2013 -0800 Indicate whether JavaScript is enabled trac #9397 --- check.pot |6 ++ public/base.html |5 - public/index.html |4 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/check.pot b/check.pot index 6bb9e11..d44533e 100644 --- a/check.pot +++ b/check.pot @@ -80,3 +80,9 @@ msgstr msgid Questions and answers site for researchers, developers, and users of Tor. Hosted on StackExchange. Currently only available in English. msgstr + +msgid JavaScript is enabled. +msgstr + +msgid JavaScript is disabled. +msgstr diff --git a/public/base.html b/public/base.html index f4dc22a..8414023 100644 --- a/public/base.html +++ b/public/base.html @@ -78,6 +78,9 @@ display: block; margin-bottom: 0.4em; } +#js { + font-size: 0.8em; +} /style /head body @@ -88,8 +91,8 @@ {{ template body . }} /div div class=foot -{{ template foot . }} p class=project{{ GetText .Lang The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy. }} a href=https://www.torproject.org/about/overview.html.en;{{ GetText .Lang Learn More raquo; | UnEscaped }}/a/p +{{ template foot . }} /div /body /html \ No newline at end of file diff --git a/public/index.html b/public/index.html index 9477480..7441f94 100644 --- a/public/index.html +++ b/public/index.html @@ -50,6 +50,10 @@ /div {{ end }} {{ define foot }} +p id=js + scriptdocument.getElementById(js).textContent = JavaScript is enabled.;/script + noscriptJavaScript is disabled./noscript +/p script document.getElementById(cl).addEventListener(change, function () { document.getElementById(lang).submit(); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [check/master] Translate JS strings
commit 566ee1e00fd571f8e5495e925a1b3a5367146385 Author: Arlo Breault arlo...@gmail.com Date: Mon Dec 2 23:29:18 2013 -0800 Translate JS strings Should have been part of the previous commit b0f9013. --- public/index.html |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 7441f94..e95846a 100644 --- a/public/index.html +++ b/public/index.html @@ -51,8 +51,8 @@ {{ end }} {{ define foot }} p id=js - scriptdocument.getElementById(js).textContent = JavaScript is enabled.;/script - noscriptJavaScript is disabled./noscript + scriptdocument.getElementById(js).textContent = {{ GetText .Lang JavaScript is enabled. }};/script + noscript{{ GetText .Lang JavaScript is disabled. }}/noscript /p script document.getElementById(cl).addEventListener(change, function () { ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [check/master] Remove line break
commit 97a104256df4b761c35d0d7795ac7183c33e40f8 Author: Arlo Breault arlo...@gmail.com Date: Mon Dec 2 23:38:29 2013 -0800 Remove line break --- public/index.html |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index e95846a..11031ef 100644 --- a/public/index.html +++ b/public/index.html @@ -34,8 +34,7 @@ {{ end }} p class=mid {{ if .IsTor }} - {{ GetText .Lang Please refer to the a href=\https://www.torproject.org/\;Tor website/a for further information about using Tor safely. You are now free to browse the Internet anonymously. | UnEscaped }} - br /{{ GetText .Lang For more information about this exit relay, see: }} a href=https://atlas.torproject.org/#details/{{ .Fingerprint }}Atlas/a. + {{ GetText .Lang Please refer to the a href=\https://www.torproject.org/\;Tor website/a for further information about using Tor safely. You are now free to browse the Internet anonymously. | UnEscaped }} {{ GetText .Lang For more information about this exit relay, see: }} a href=https://atlas.torproject.org/#details/{{ .Fingerprint }}Atlas/a. {{ else }} {{ GetText .Lang If you are attempting to use a Tor client, please refer to the a href=\https://www.torproject.org/\;Tor website/a and specifically the a href=\https://www.torproject.org/docs/faq#DoesntWork\;instructions for configuring your Tor client/a. | UnEscaped }} {{ end }} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits