January 2016 - tbb-commits - lists.torproject.org

(no subject)
by Yuxin He 23 Jan '16

23 Jan '16

1 0

[tor-browser-bundle/maint-5.5] Changelog fixup
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit f2681509eb0c5a62fce4bc60c28b9170e3b74c85 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 15:02:20 2016 +0000 Changelog fixup --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6042c2f..d08a7bc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,7 @@ Tor Browser 5.5 -- January 26 2016 * Bug 16940: After update, load local change notes * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) * Bug 17369: Disable RC4 fallback * Bug 17442: Remove custom updater certificate pinning * Bug 16620: Move window.name handling into a Firefox patch

1 0

[tor-browser-bundle/master] Changelog update
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit 63a8a1baef6b8470d9f0e7cab4d299372fe318b2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 15:00:40 2016 +0000 Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6000e97..6f85c75 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -18,6 +18,7 @@ Tor Browser 6.0a1 -- January 27 2016 * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser * Bug 16322: Use onion address for DuckDuckGo search engine * Bug 17917: Changelog after update is empty if JS is disabled + * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) * Build System * Linux * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) @@ -48,6 +49,7 @@ Tor Browser 5.5 -- January 26 2016 * Bug 16940: After update, load local change notes * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) * Bug 17369: Disable RC4 fallback * Bug 17442: Remove custom updater certificate pinning * Bug 16620: Move window.name handling into a Firefox patch

1 0

[tor-browser-bundle/master] nightly version bumps
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit 4ef179fd92e788238adc1a1b123779099f201994 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 14:08:50 2016 +0000 nightly version bumps --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c64d4bb..4429066 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,11 +14,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.5.0esr +FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -43,12 +43,12 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -66,7 +66,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,7 +94,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 +NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Release preparations
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit fdb68b2ddbe0ba9c4f0a316e850488def5f24c85 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 14:05:32 2016 +0000 Release preparations Changelog update, version bumps, config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6042c2f..6000e97 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 6.0a1 -- January 27 2016 + * All Platforms + * Update Firefox to 38.6.0esr + * Update NoScript to 2.9.0.2 + * Update Torbutton to 1.9.5 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Code cleanup + * Translation updates + * Update Tor Launcher to 0.2.9 + * Bug 18113: Randomly permutate available default bridges of chosen type + * Bug 11773: Setup wizard UI flow improvements + * Translation updates + * Bug 17428: Remove Flashproxy + * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18072: Change recommended pluggable transport type to obfs4 + * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser + * Bug 16322: Use onion address for DuckDuckGo search engine + * Bug 17917: Changelog after update is empty if JS is disabled + * Build System + * Linux + * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) + Tor Browser 5.5 -- January 26 2016 * All Platforms * Update Firefox to 38.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5b7ef02..d234e33 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.5.0esr +FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.4.2 +TORLAUNCHER_TAG=0.2.9 +TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -36,12 +36,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,7 +87,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 +NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 362c146..a0f5309 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a6 + alpha: 6.0a1 release: 5.5 versions: 5.5: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a6: - platformVersion: 38.5.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a6 + 6.0a1: + platformVersion: 38.6.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a1 incremental_from: - - 5.5a5 + - 5.5a6 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/maint-1.9.4] Make it clear that 1.9.4.3 is coming from 1.9.3.7
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit 430111138560e7605172bf1878a022c64f6f320d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 12:49:02 2016 +0000 Make it clear that 1.9.4.3 is coming from 1.9.3.7 --- src/CHANGELOG | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index baf3fd0..933eeeb 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,7 +2,11 @@ * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update * Bug 18004: Remove Tor fundraising donation banner - * Code cleanup + * Bug 16940: After update, load local change notes + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17351: Code cleanup * Translation updates 1.9.4.2

1 0

[torbutton/master] Relase preparations
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit f913aca2d078f738d81c5b59346292269d79a0ab Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 12:17:24 2016 +0000 Relase preparations CHANGELOG update, translation update, version bump --- src/CHANGELOG | 14 ++++++++++++++ src/chrome/locale/ar/aboutDialog.dtd | 4 ++-- src/chrome/locale/ar/aboutTBUpdate.dtd | 8 ++++---- src/chrome/locale/ar/aboutTor.dtd | 9 +++------ src/chrome/locale/ar/aboutTor.properties | 12 ------------ src/chrome/locale/ar/brand.properties | 2 +- src/chrome/locale/de/aboutTor.dtd | 3 --- src/chrome/locale/de/aboutTor.properties | 12 ------------ src/chrome/locale/es/aboutTor.dtd | 9 +++------ src/chrome/locale/es/aboutTor.properties | 12 ------------ src/chrome/locale/eu/aboutTor.dtd | 3 --- src/chrome/locale/eu/aboutTor.properties | 12 ------------ src/chrome/locale/fa/aboutTor.dtd | 3 --- src/chrome/locale/fa/aboutTor.properties | 12 ------------ src/chrome/locale/fr/aboutTor.dtd | 3 --- src/chrome/locale/fr/aboutTor.properties | 12 ------------ src/chrome/locale/it/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/it/aboutTor.dtd | 9 +++------ src/chrome/locale/it/aboutTor.properties | 12 ------------ src/chrome/locale/ja/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/ja/aboutTor.dtd | 9 +++------ src/chrome/locale/ja/aboutTor.properties | 12 ------------ src/chrome/locale/ko/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/ko/aboutTor.dtd | 11 ++++------- src/chrome/locale/ko/aboutTor.properties | 18 +++--------------- src/chrome/locale/ko/brand.dtd | 2 +- src/chrome/locale/ko/brand.properties | 2 +- src/chrome/locale/nl/aboutTor.dtd | 3 --- src/chrome/locale/nl/aboutTor.properties | 12 ------------ src/chrome/locale/pl/aboutTor.dtd | 9 +++------ src/chrome/locale/pl/aboutTor.properties | 12 ------------ src/chrome/locale/pt/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/pt/aboutTor.dtd | 25 +++++++++++-------------- src/chrome/locale/pt/aboutTor.properties | 12 ------------ src/chrome/locale/ru/aboutTor.dtd | 3 --- src/chrome/locale/ru/aboutTor.properties | 12 ------------ src/chrome/locale/sv/aboutTor.dtd | 9 +++------ src/chrome/locale/sv/aboutTor.properties | 12 ------------ src/chrome/locale/tr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/tr/aboutTor.dtd | 9 +++------ src/chrome/locale/tr/aboutTor.properties | 12 ------------ src/chrome/locale/vi/aboutTor.dtd | 3 --- src/chrome/locale/vi/aboutTor.properties | 12 ------------ src/chrome/locale/zh-CN/aboutTor.dtd | 3 --- src/chrome/locale/zh-CN/aboutTor.properties | 18 +++--------------- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- src/install.rdf | 2 +- 47 files changed, 89 insertions(+), 330 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index c56939d..c31cda9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,17 @@ +1.9.5 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Code cleanup + * Translation updates + +1.9.4.3 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Code cleanup + * Translation updates + 1.9.4.2 * Bug 16940: After update, load local change notes * Bug 16990: Avoid matching '250 ' to the end of node name diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index 2d808e6..248786e 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -5,13 +5,13 @@ <!ENTITY help.start "هل ترغب في المساعدة؟">  -<!ENTITY help.donateLink "تبرع"> +<!ENTITY help.donateLink "تبرّع"> <!ENTITY help.or "أو">  <!ENTITY help.getInvolvedLink "شارك"> <!ENTITY help.end "علامة تعجب">  -<!ENTITY bottomLinks.questions "أى أسئلة؟"> +<!ENTITY bottomLinks.questions "أية أسئلة؟">  <!ENTITY bottomLinks.grow "ساعد شبكة تور على النمو">  diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index 37567bd..ce40b98 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "تحديث متصفح تور"> +<!ENTITY aboutTBUpdate.updated "لقد تم تحديث متصفح تور."> +<!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> +<!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 4d3caae..8945674 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "عن تور"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "هذا المتصفح خارج التحديث"> <!ENTITY aboutTor.outOfDateTorOff.label "أيضاً، هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDate2.label "اضغط على رمز البصلة ثم اختر "تحقق من تحديثات متصفح تور""> <!ENTITY aboutTor.check.label "اختبر إعدادات شبكة تور."> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "مرحبا بك في متصفح تور"> +<!ENTITY aboutTor.success2.label "تم الإتصال بشبكة تور"> <!ENTITY aboutTor.success3.label "يمكنك الآن تصفح الانترنت بشكل يحمي هويتك."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "مشروع تور هو مشروع غير ربحي (حسب US 501(c)(3)) مُكرس للبحث، والتطوير، والتوعية حول موضوع إخفاء الهوية والخصوصية."> <!ENTITY aboutTor.learnMore.label "اقرأ المزيد عن مشروع تور »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "تبرع"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index 10f09a1..d607324 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S" aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/ar/brand.properties b/src/chrome/locale/ar/brand.properties index 75c5fd1..835f1b9 100644 --- a/src/chrome/locale/ar/brand.properties +++ b/src/chrome/locale/ar/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=متصفح Tor +brandShorterName=متصفح تور brandShortName=متصفح تور brandFullName=متصفح تور vendorShortName=مشروع تور diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 1539814..a46329f 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Die Organisation »The Tor Project« ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich der Forschung, der Entwicklung und der Schulung zum Thema Internetanonymität und Datenschutz."> <!ENTITY aboutTor.learnMore.label "Mehr über das Tor-Projekt erfahren »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Spenden"> -<!ENTITY aboutTor.donate.supportTor "Bitte unterstützen Sie Tor!"> diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index d73f7a3..b7fc4bf 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S"> aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden hätte mich nicht ohne Tor und andere kostenlose Software Verschlüsselungs-Projekte kontaktieren können. Tor ist ein wesentliches Werkzeug und es benötigt unsere Unterstützung. -aboutTor.donationBanner.lp.speciality=Oscar-prämierte Dokumentarfilmerin, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privatsphäre und Anonymität betreffen uns alle. -aboutTor.donationBanner.cd.speciality= Novellist, Technologie-Aktivist, Co-Editor von Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Bitte hilf dem weltweit stärksten Tool für Privatsphäre nachhaltiger zu werden. -aboutTor.donationBanner.rd.speciality=Gründer, amtierender Geschäftsführender Direktor des Tor-Projektes diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index c339af6..5c781c8 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Acerca de Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> <!ENTITY aboutTor.outOfDate2.label "Haga clic en la cebolla y luego seleccione Comprobar actualizaciones del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Bienvenido al Navegador Tor"> +<!ENTITY aboutTor.success2.label "Conectado a la red Tor."> <!ENTITY aboutTor.success3.label "Ahora es libre de navegar por Internet anónimamente."> <!ENTITY aboutTor.failure.label "¡Algo fue mal!"> <!ENTITY aboutTor.failure2.label "Tor no está funcionando en este navegador."> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "El Projecto Tor es una US 501(c)(3) sin ánimo de lucro dedicada a la investigación, desarrollo y educación sobre anonimidad y privacidad en línea."> <!ENTITY aboutTor.learnMore.label "Aprenda más acerca del El Proyecto Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Donar"> -<!ENTITY aboutTor.donate.supportTor "Por favor ayuda a Tor!"> diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index ca89874..fb92251 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Busque <a href="%1$S">de forma segura</a> con <a href= aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index e07140d..76020fc 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa."> <!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Egizu dohaintza"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index 32335f8..30a7858 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: < aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 27edf8b..c0ae835 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "پروژهٔ تور سازمان غیر انتفاعی آمریکایی 501(c)3 مختص پژوهش, توسعه و آموزش در زمین ناشناسی و حریم شخصی آنلاين هست."> <!ENTITY aboutTor.learnMore.label "اطلاعات بیشتر در پروژهٔ تور كسب كنيد"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "اهدا"> -<!ENTITY aboutTor.donate.supportTor "لطفا از تور حمایت کنید."> diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index f39d06f..54e04d9 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="% aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=ادوارد اسنودن بدون تور و سایر پروژه‌های نرم‌افزاری رایگان در زمینه‌ی رمزگذاری، قادر به تماس با من نبود. تور ابزاری ضروری است، و به پشتیبانی ما نیاز دارد. -aboutTor.donationBanner.lp.speciality=برنده‌ی جایزه‌ی اسکار بهترین مستند، شهروند شماره چهار - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=حریم خصوصی و هم‌چنین گمنام ماندن، موضوع مهمی برای همه‌ی ما به‌شمار می‌آید. -aboutTor.donationBanner.cd.speciality= رمان نویس، فعال زمینه فناوری، همکاری ویراستار Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=لطفا کمک کنید تا قوی‌ترین ابزار حفظ حریم شخصی، پایدارتر شود. -aboutTor.donationBanner.rd.speciality=بنیان گذار، مدیر اجرایی فعال پروژه‌ی تور diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 4420599..ec76322 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Le projet Tor est une organisation à but non lucratif (US 501(c)(3)) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> <!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html"> - -<!ENTITY aboutTor.donate.donate "Faire une donation"> -<!ENTITY aboutTor.donate.supportTor "Merci de soutenir Tor !"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index d0b3c4d..ec59d81 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden n'aurait pas pu me contacter sans Tor et d'autres projects libres de logiciels de chiffrement. Tor est un outil essentiel, et il a besoin de notre support. -aboutTor.donationBanner.lp.speciality=Réalisatrice Oscar du Meilleur Documentaire, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Confidentialité et anonymat nous concerne tous. -aboutTor.donationBanner.cd.speciality= Auteur, Activiste pour la technologie, co-editeur de Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Veuillez aider l'outil d'anonymat le plus efficace dans le monde à devenir plus indépendant ! -aboutTor.donationBanner.rd.speciality=Fondateur, Directeur Exécutif Intérimaire du Projet Tor diff --git a/src/chrome/locale/it/aboutTBUpdate.dtd b/src/chrome/locale/it/aboutTBUpdate.dtd index 37567bd..2229d15 100644 --- a/src/chrome/locale/it/aboutTBUpdate.dtd +++ b/src/chrome/locale/it/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "Aggiornamento del Browser TOR"> +<!ENTITY aboutTBUpdate.updated "Il Browser TOR è stato aggiornato."> +<!ENTITY aboutTBUpdate.linkPrefix "Per maggiori informazioni su questa versione,"> +<!ENTITY aboutTBUpdate.linkLabel "visita il nostro sito web"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Log dei cambiamenti:"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index d334ab7..17eba77 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Info su Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ATTENZIONE: questo browser non è aggiornato."> <!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non è aggiornato."> <!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e scegli "Scarica Aggiornamento Tor Browser Bundle"."> <!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Benvenuto nel Browser TOR"> +<!ENTITY aboutTor.success2.label "Connesso alla rete TOR."> <!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente."> <!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!"> <!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser."> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Il Tor Project è un'organizzazione 501(c)(3) non-profit americana dedicata alla ricerca, sviluppo ed educazione sull'anonimato e privacy online."> <!ENTITY aboutTor.learnMore.label "Maggiori info sul Tor Project »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Dona"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 5006a7d..db49b15 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Cerca <a href="%1$S"> in sicurezza </a> con <a href="% aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/ja/aboutTBUpdate.dtd b/src/chrome/locale/ja/aboutTBUpdate.dtd index 3e57766..e862134 100644 --- a/src/chrome/locale/ja/aboutTBUpdate.dtd +++ b/src/chrome/locale/ja/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "TorBrowserアップデート"> +<!ENTITY aboutTBUpdate.updated "TorBrowserアップデート完了"> +<!ENTITY aboutTBUpdate.linkPrefix "このリリースについての最新情報を入手するため、"> +<!ENTITY aboutTBUpdate.linkLabel "我々のウェブサイトを見てください"> <!ENTITY aboutTBUpdate.linkSuffix "。"> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "変更履歴"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index a093b1e..10844f3 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Torについて"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "警告：このブラウザは古いバージョンです。"> <!ENTITY aboutTor.outOfDateTorOff.label "また、このブラウザは古いバージョンです。"> <!ENTITY aboutTor.outOfDate2.label "Onion をクリックして Tor Browser のアップデートを確認してください。"> <!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "ＴｏｒＢｒｏｗｓｅｒにようこそ"> +<!ENTITY aboutTor.success2.label "Torネットワークに接続しました"> <!ENTITY aboutTor.success3.label "現在、自由に匿名でインターネットをブラウズ出来ます。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> <!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Tor Projectは、オンラインの匿名性とプライバシーの研究・開発・教育を専門に行う米国の501(c)(3)非営利団体です。"> <!ENTITY aboutTor.learnMore.label "Tor Projectに関する詳細 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "寄付"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 290c072..ed1ecc6 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=<a href="%2$S">Disconnect.me</a>で<a href="%1$S">安 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/ko/aboutTBUpdate.dtd b/src/chrome/locale/ko/aboutTBUpdate.dtd index 545f269..5ad84ba 100644 --- a/src/chrome/locale/ko/aboutTBUpdate.dtd +++ b/src/chrome/locale/ko/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "Tor 브라우저 업데이트"> +<!ENTITY aboutTBUpdate.updated "Tor 브라우저가 업데이트되었습니다."> +<!ENTITY aboutTBUpdate.linkPrefix "이번 업데이트에 대해 더 알고 싶으시면"> +<!ENTITY aboutTBUpdate.linkLabel "저희 사이트를 방문해 주세요"> <!ENTITY aboutTBUpdate.linkSuffix " "> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "변경사항:"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 2ee34ad..23ca3ac 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Tor에 대해서"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "또 한, 이 브라우저는 오래되었습니다."> +<!ENTITY aboutTor.outOfDateTorOn.label "주의: 현재 구버전 브라우저를 사용하고 계십니다."> +<!ENTITY aboutTor.outOfDateTorOff.label "또한, 현재 구버전 브라우저를 사용하고 계십니다."> <!ENTITY aboutTor.outOfDate2.label "onion을 클릭하고 Tor Browser 업데이트 체크를 선택하세요."> <!ENTITY aboutTor.check.label "Tor 네트워크 설정 테스트"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Tor 브라우저에 오신 것을 환영합니다"> +<!ENTITY aboutTor.success2.label "Tor 네트워크에 연결되었습니다."> <!ENTITY aboutTor.success3.label "이제 자유롭게 익명으로 인터넷을 탐색할 수 있습니다."> <!ENTITY aboutTor.failure.label "뭔가 잘못되었습니다!"> <!ENTITY aboutTor.failure2.label "Tor는 이 브라우저에서 작동하지 않습니다."> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Tor 프로젝트란? 온라인 익명 및 개인 정보 보호의 연구, 개발 및 교육에 힘쓰는 US 501(c)(3) 비영리 단체입니다."> <!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대해서 더 알아보기 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "후원하기"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties index 1d37de7..69c53da 100644 --- a/src/chrome/locale/ko/aboutTor.properties +++ b/src/chrome/locale/ko/aboutTor.properties @@ -2,32 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%2$S">시작페이지</a>를 <a href="%1$S">안전하게</a> 검색 +aboutTor.searchSP.privacy=<a href="%2$S">시작페이지</a>를 통해 <a href="%1$S">안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>를 <a href="%1$S>안전하게</a> 검색 +aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>를 통해 <a href="%1$S>안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=<a href="%2$S">Diconnect.me</a>를 <a href="%1$S">안전하게</a> +aboutTor.searchDC.privacy=<a href="%2$S">Diconnect.me</a>를 통해 <a href="%1$S">안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/ko/brand.dtd b/src/chrome/locale/ko/brand.dtd index 78aa858..d8b78d3 100644 --- a/src/chrome/locale/ko/brand.dtd +++ b/src/chrome/locale/ko/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShorterName "Tor 브라우저"> <!ENTITY brandShortName "Tor 브라우저"> <!ENTITY brandFullName "Tor 브라우저"> <!ENTITY vendorShortName "Tor 프로젝트"> diff --git a/src/chrome/locale/ko/brand.properties b/src/chrome/locale/ko/brand.properties index 36b8d8b..81a7488 100644 --- a/src/chrome/locale/ko/brand.properties +++ b/src/chrome/locale/ko/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser +brandShorterName=Tor 브라우저 brandShortName=Tor 브라우저 brandFullName=Tor 브라우저 vendorShortName=Tor 프로젝트 diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index fcc46ec..9c6068b 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Het Tor Project is een US 501(c)(3) non-profit voor onderzoek, ontwikkeling, onderwijs in online anonimiteit en privacy."> <!ENTITY aboutTor.learnMore.label "Leer meer over Het Tor Project » "> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Doneer"> -<!ENTITY aboutTor.donate.supportTor "Steun a.u.b. Tor!"> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index 8c2c87f..63c49fa 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">Di aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden zou geen contact met mij kunnen hebben zonder Tor en andere gratis software encryptie projecten. Tor is essentieel, en het heeft nu onze hulp nodig. -aboutTor.donationBanner.lp.speciality=Oscar-Winnend Documentaire Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy en anonimiteit is voor iedereen belangrijk. -aboutTor.donationBanner.cd.speciality= Romanschrijver, technologie activist en co-redacteur van Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Help mee met het in stand houden van het sterkste privacy tool van de wereld! -aboutTor.donationBanner.rd.speciality=Oprichter, Adjunct-directeur van het Tor Project diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index a79b973..e307e5b 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Informacje na temat Tor'a"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "Ostrzeżenie: ta przeglądarka jest nieaktualna."> <!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglądarka jest nieaktualna."> <!ENTITY aboutTor.outOfDate2.label "Kliknij na ikonę cebuli, a następnie wybierz Sprawdź czy są dostępne aktualizacje."> <!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Witamy w Tor Browser"> +<!ENTITY aboutTor.success2.label "Połączono z siecią Tor"> <!ENTITY aboutTor.success3.label "Możesz teraz swobodnie przeglądać Internet anonimowo."> <!ENTITY aboutTor.failure.label "Coś poszło nie tak!"> <!ENTITY aboutTor.failure2.label "Tor nie działa w tej przeglądarce."> @@ -49,6 +49,3 @@ * 501(c)(3)"> <!ENTITY aboutTor.learnMore.label "Dowiedz się więcej na temat Tor Project »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Wspomóż finansowo"> -<!ENTITY aboutTor.donate.supportTor "Proszę wspomóż Tor!"> diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index 88c79b9..9bf0dcd 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszu aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/pt/aboutTBUpdate.dtd b/src/chrome/locale/pt/aboutTBUpdate.dtd index 37567bd..8b22e17 100644 --- a/src/chrome/locale/pt/aboutTBUpdate.dtd +++ b/src/chrome/locale/pt/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "Navegador Tor - Atualização"> +<!ENTITY aboutTBUpdate.updated "O Navegador Tor foi atualizado"> +<!ENTITY aboutTBUpdate.linkPrefix "Para a informação mais atualizada sobre este lançamento,"> +<!ENTITY aboutTBUpdate.linkLabel "visite o nosso site da Web"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Registo de alterações:"> diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index 8fd6939..24ff4a5 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -6,17 +6,17 @@ <!ENTITY aboutTor.title "Sobre o Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado."> -<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha 'Procurar atualizações do navegador Tor'"> +<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOff.label "Este navegador também está desatualizado."> +<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha 'Procurar por atualizações do Navegador Tor'"> -<!ENTITY aboutTor.check.label "Testar as Configurações da Rede Tor"> +<!ENTITY aboutTor.check.label "Testar Configurações da Rede Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> -<!ENTITY aboutTor.success3.label "Agora já está livre para navegar na Internet anonimamente."> -<!ENTITY aboutTor.failure.label "Ocorreu Algo de Errado!"> -<!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> +<!ENTITY aboutTor.success.label "Bem-vindo ao Navegador Tor"> +<!ENTITY aboutTor.success2.label "Ligado à rede Tor."> +<!ENTITY aboutTor.success3.label "Agora já está livre para navegar anonimamente na Internet."> +<!ENTITY aboutTor.failure.label "Ocorreu algo de errado!"> +<!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> <!ENTITY aboutTor.failure3prefix.label "Para assistência, por favor, contacte"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> @@ -32,7 +32,7 @@ <!ENTITY aboutTor.torInfo3.label "Nó de saída:"> <!ENTITY aboutTor.torInfo4.label "Este servidor não regista qualquer informação sobre os visitantes."> <!ENTITY aboutTor.whatnextQuestion.label "E a seguir?"> -<!ENTITY aboutTor.whatnextAnswer.label "O Tor NÃO é tudo o que precisa para navegar anonimamente na Internet! Poderá ter que mudar alguns dos seus hábitos de navegação para ter a certeza que a sua identidade está segura."> +<!ENTITY aboutTor.whatnextAnswer.label "O Tor NÃO é tudo o que precisa para navegar anonimamente! Poderá ter que alterar alguns dos seus hábitos de navegação para assegurar que a sua identidade fica segura."> <!ENTITY aboutTor.whatnext.label "Dicas Sobre Como se Manter Anónimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Você Pode Ajudar!"> @@ -44,9 +44,6 @@ <!ENTITY aboutTor.helpInfo5.label "Efetue um Donativo »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3) dedicada à investigação, desenvolvimento e promoção de anonimato e privacidade on-line."> +<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3), dedicada à investigação, desenvolvimento e promoção do anonimato e privacidade on-line."> <!ENTITY aboutTor.learnMore.label "Saber mais sobre o Projeto Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Doar"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties index 85e9a0d..7bf9d5d 100644 --- a/src/chrome/locale/pt/aboutTor.properties +++ b/src/chrome/locale/pt/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Procurar com <a href="%1$S">segurança</a> com <a href aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index ac71c5b..f2ea375 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -48,6 +48,3 @@ <!ENTITY aboutTor.learnMore.label "Узнайте больше о проекте Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html#ru "> - -<!ENTITY aboutTor.donate.donate "Пожертвовать"> -<!ENTITY aboutTor.donate.supportTor "Пожалуйста, поддержите Tor!"> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index e294d61..6795b7c 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Ищите <a href="%1$S">конфиденциальн aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Лора Пойтрас -aboutTor.donationBanner.lp.quote=Эдвард Сноуден не был бы в состоянии связаться со мной без Tor и других проектов свободного программного обеспечения для шифрования. Тор является важным инструментом, и он нуждается в нашей поддержке. -aboutTor.donationBanner.lp.speciality=обладатель "Оскара" за лучший документальный фильм CitizenFour - -aboutTor.donationBanner.cd.who=— Кори Доктороу -aboutTor.donationBanner.cd.quote=Конфиденциальность и анонимность важна для всех нас. -aboutTor.donationBanner.cd.speciality= Писатель, активист в области технологий, соредактор ресурса "Boing Boing" - -aboutTor.donationBanner.rd.who=— Роджер Динглдайн -aboutTor.donationBanner.rd.quote=Пожалуйста, помогите сильнейшему инструменту конфиденциальности в мире стать более стабильным! -aboutTor.donationBanner.rd.speciality=Основатель, исполнительный директор Tor Project diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 75c4ed1..5f4cf5e 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "VARNING: den här webbläsaren är inte uppdaterad."> <!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webbläsare är ej uppdaterad."> <!ENTITY aboutTor.outOfDate2.label "Klicka på Tor-löken och välj sedan 'Sök efter uppdateringar för Tor webbläsare'."> <!ENTITY aboutTor.check.label "Testa nätverksinställningarna för Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Välkommen till Tor Browser"> +<!ENTITY aboutTor.success2.label "Ansluten till Tor-nätverket."> <!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Tor projektet är en US 501(c)(3) non-profit organisation som utför forskning, utveckling, och utbildning inom online anonymitet och integritet."> <!ENTITY aboutTor.learnMore.label "Mer information om Tor-projektet »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Donera"> -<!ENTITY aboutTor.donate.supportTor "Vänligen stöd Tor!"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index c74928f..fafe44a 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">Dis aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden skulle inte ha kunnat kontakta mig utan Tor och andra öppna projekt för kryptering. Tor är ett väsentligt verktyg, och det behöver vårt stöd. -aboutTor.donationBanner.lp.speciality=Oscar-vinnande dokumentärfilmare, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Integritet och anonymitet är viktigt för oss alla. -aboutTor.donationBanner.cd.speciality= Romanförfattare, teknikaktivist och medredaktör för Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Vänligen hjälp det starkaste integritetsverktyget i världen att bli mer hållbart! -aboutTor.donationBanner.rd.speciality=Grundare, tillförordnad verkställande direktör för Tor-projektet diff --git a/src/chrome/locale/tr/aboutTBUpdate.dtd b/src/chrome/locale/tr/aboutTBUpdate.dtd index e92e395..5aac624 100644 --- a/src/chrome/locale/tr/aboutTBUpdate.dtd +++ b/src/chrome/locale/tr/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Tor Browser Güncellemesi"> <!ENTITY aboutTBUpdate.updated "Tor Browser güncellendi."> -<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki en güncel bilgiler için."> -<!ENTITY aboutTBUpdate.linkLabel "web sitemize bakın"> +<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncelleme bilgilerinin çoğu "> +<!ENTITY aboutTBUpdate.linkLabel "web sitemizden edinilebilir"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Sürüm notları:"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 98e110e..3e3db58 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -13,9 +13,9 @@ <!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Sınayın"> <!ENTITY aboutTor.success.label "Tor Browser'a Hoş Geldiniz"> -<!ENTITY aboutTor.success2.label "Tor ağına bağlanın."> -<!ENTITY aboutTor.success3.label "Artık Internet'te özgürce ve anonim olarak dolaşabilirsiniz."> -<!ENTITY aboutTor.failure.label "Birşeyler Ters Gitti!"> +<!ENTITY aboutTor.success2.label "Tor ağına bağlanıldı."> +<!ENTITY aboutTor.success3.label "Artık İnternet'te özgürce ve anonim olarak dolaşabilirsiniz."> +<!ENTITY aboutTor.failure.label "Bir Şeyler Ters Gitti!"> <!ENTITY aboutTor.failure2.label "Tor bu tarayıcı ile çalışmıyor."> <!ENTITY aboutTor.failure3prefix.label "Yardım almak için bizimle görüşün"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Tor Projesi, ABD 501(c)(3) kapsamında çevrim içi gizlilik ve mahremiyet üzerine araştırma, geliştirme ve eğitim çalışmaları yapan ve kar amacı gütmeyen bir kuruluştur."> <!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok şey öğrenin »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Bağış Yapın"> -<!ENTITY aboutTor.donate.supportTor "Lütfen Tor Projesini Destekleyin!"> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index c034690..686b883 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=<a href="%2$S">Disconnect.me</a> kullanarak <a href="% aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Tor ve diğer özgür yazılım şifreleme projeleri olmadan Edward Snowden benimle görüşemezdi. Tor olmazsa olmaz bir araç ve desteklenmesi gerekiyor. -aboutTor.donationBanner.lp.speciality=Oscar ödüllü citizenFour belgeselinin yönetmeni - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Kişisel gizlilik ve anonim kalmak hepimiz için önemli. -aboutTor.donationBanner.cd.speciality= Yazar, teknoloji aktivisti ve Boing Boing editörü - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Dünyadaki en güçlü kişisel gizlilik koruma yazılımının kalıcı olmasına yardımcı olun! -aboutTor.donationBanner.rd.speciality=Tor Projesinin Kurucusu ve Yürütücü Başkanı diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index e3d1629..3ab6a1b 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "Dự án Tor là một US 501(c)(3) không lợi nhuận chuyên dùng cho nghiên cứu, phát triển và giao dục về vô danh và riêng tư trực tuyến"> <!ENTITY aboutTor.learnMore.label "Tìm hiểu thêm về Tor Project"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Donate"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties index 10f09a1..d607324 100644 --- a/src/chrome/locale/vi/aboutTor.properties +++ b/src/chrome/locale/vi/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S" aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index fa3d5f3..4d02c9b 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "The Tor Project 是一家美国 501(c)(3) 非营利组织，致力于在线匿名与隐私的研究、开发与教育。"> <!ENTITY aboutTor.learnMore.label "了解更多有关 The Tor Project 的信息 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "捐款"> -<!ENTITY aboutTor.donate.supportTor "请支持 Tor！"> diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 62b5528..39dbd19 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -2,32 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=使用<a href="%2$S">开始页</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchSP.privacy=使用<a href="%2$S">Startpage</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— 罗拉·柏翠丝（Laura Poitras） -aboutTor.donationBanner.lp.quote=如果没有 Tor 和其他自由的加密软件，爱德华·斯诺登不可能与我联系。Tor 是必不可少的工具；Tor 需要我们的支持！ -aboutTor.donationBanner.lp.speciality=奥斯卡获奖纪录片《第四公民》制作人 - -aboutTor.donationBanner.cd.who=— 科利·多克托罗（Cory Doctorow） -aboutTor.donationBanner.cd.quote=隐私和匿名事关我们每一个人。 -aboutTor.donationBanner.cd.speciality= 小说家，技术活动家，Boing Boing 共同主编 - -aboutTor.donationBanner.rd.who=— 罗杰·丁格尔丹（Roger Dingledine） -aboutTor.donationBanner.rd.quote=请帮助世界上最强的隐私工具变得更加可持续发展！ -aboutTor.donationBanner.rd.speciality=Tor Project 创始人，临时执行董事 diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 235e817..1972a7a 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -148,7 +148,7 @@ <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> -<!ENTITY torbutton.prefs.resist_fingerprinting "对相关 Tor 浏览器信息进行修改，以区别你与其他 Tor 用户"> +<!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> <!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可提供最佳的用户体验。"> diff --git a/src/install.rdf b/src/install.rdf index cbf74d0..b75ddbe 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.4.2</em:version> + <em:version>1.9.5</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Make it clear that 1.9.4.3 is coming from 1.9.3.7
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit cebf866143b4deb113a48c1e5ff05a2cf635af50 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 12:46:10 2016 +0000 Make it clear that 1.9.4.3 is coming from 1.9.3.7 --- src/CHANGELOG | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index c31cda9..3c24227 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -9,7 +9,11 @@ * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update * Bug 18004: Remove Tor fundraising donation banner - * Code cleanup + * Bug 16940: After update, load local change notes + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17351: Code cleanup * Translation updates 1.9.4.2

1 0

[gitian-builder/tor-browser-builder-3] ensure guest upgrade occurs before attempting to get manifest
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit 5c81bf36119dbecc17e55568ef3bc9f30dce0cff Author: Devrandom <c1.devrandom(a)niftybox.net> Date: Mon Mar 23 20:47:39 2015 -0700 ensure guest upgrade occurs before attempting to get manifest fixes #85 --- .gitignore | 1 + RELEASE_NOTES | 13 +++++++++++++ bin/gbuild | 9 ++++++++- target-bin/grab-packages.sh | 6 +++--- target-bin/upgrade-system.sh | 15 +++++++++++++++ 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54df527..696aae0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ inputs base* *.qcow2 sigs +target-bin/bootstrap-fixup diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 514cfdc..7662703 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,16 @@ +2015-03-23 +---------- + +Now ensuring that `apt-get dist-upgrade` occurs at least once before package manifest +is computed. This is because distributions usually don't store old versions of packages +in the repos, so we can't download the exact package version we have installed if it's +out of date. + +gbuild now has a --upgrade flag that forces an upgrade after the first one. + +Other Notes +=========== + Important: We are planning on switching from using lxc-start to using lxc-execute. lxc-execute requires lxc-init (or init.lxc) to be available on the guest at one of the expected places. You might have to manually install lxc on your base VM image or recreate the image. diff --git a/bin/gbuild b/bin/gbuild index da49d50..d256986 100755 --- a/bin/gbuild +++ b/bin/gbuild @@ -92,7 +92,11 @@ def build_one_configuration(suite, arch, build_desc, reference_datetime) info "Installing additional packages (log in var/install.log)" system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1" - info "Grabbing package manifest" + if @options[:upgrade] || system("on-target -u root '[ ! -e /var/cache/gitian/initial-upgrade ]'") + info "Upgrading system, may take a while" + system! "on-target -u root bash < target-bin/upgrade-system.sh > var/install.log 2>&1" + end + info "Creating package manifest" system! "on-target -u root bash < target-bin/grab-packages.sh > var/base-#{suitearch}.manifest" info "Creating build script (var/build-script)" @@ -130,6 +134,9 @@ OptionParser.new do |opts| opts.on("-i", "--skip-image", "reuse current target image") do |v| @options[:skip_image] = v end + opts.on("--upgrade", "upgrade guest with latest packages") do |v| + @options[:upgrade] = v + end opts.on("-q", "--quiet", "be quiet") do |v| @options[:quiet] = v end diff --git a/target-bin/grab-packages.sh b/target-bin/grab-packages.sh index adf8e34..2fef08e 100644 --- a/target-bin/grab-packages.sh +++ b/target-bin/grab-packages.sh @@ -6,7 +6,7 @@ set -e cd /var/cache/apt/archives -#apt-get clean - -dpkg-query -W -f '${Package}\n' | xargs -n 50 apt-get install --reinstall -y -d > /dev/null +# make sure all packages with installed versions are downloaded +dpkg-query -W -f '${Package}=${Version}\n' | xargs -n 50 apt-get install -q --reinstall -y -d > /tmp/download.log +grep "cannot be downloaded" /tmp/download.log && { echo Could not download some packages, please run gbuild --upgrade 1>&2 ; exit 1 ; } sha256sum *.deb | sort --key 2 diff --git a/target-bin/upgrade-system.sh b/target-bin/upgrade-system.sh new file mode 100644 index 0000000..9384229 --- /dev/null +++ b/target-bin/upgrade-system.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Upgrade system + +set -e + +mkdir -p /var/cache/gitian + +# remove obsolete grub, it causes package dependency issues +apt-get -q -y purge grub > /dev/null 2>&1 || true + +# upgrade packages +DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade > /dev/null > /var/cache/gitian/upgrade.log 2>&1 + +touch /var/cache/gitian/initial-upgrade

1 0

[gitian-builder/tor-browser-builder-3] Bug 15578: Switch over to Wheezy for Linux builds
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit 15d166d65d006f564bf3c7dbb8780ed0649352ba Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 26 06:34:42 2015 +0000 Bug 15578: Switch over to Wheezy for Linux builds Support for Debian guest VMs was developed by Joseph Bisch. This commit is largely a backport of this feature adapted to our needs allowing us to get rid of Ubuntu Lucid which is EOL for a while now. --- README.md | 22 +++++++++++- bin/gbuild | 3 ++ bin/make-base-vm | 81 +++++++++++++++++++++++++++++++++++++------- libexec/copy-from-target | 2 +- libexec/copy-to-target | 2 +- libexec/on-target | 2 +- target-bin/bootstrap-fixup | 18 ++++++++-- 7 files changed, 111 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 2f07c6a..c78e231 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,22 @@ This performs a build inside a VM, with deterministic inputs and outputs. If th Install virtualbox from http://www.virtualbox.org, and make sure `VBoxManage` is in your `$PATH`. +## Debian Guests + +Gitian now supports Debian guests in addition to Ubuntu guests. Note that this doesn't mean you can allow the builders to choose to use either Debian or Ubuntu guests. The person creating the Gitian descriptor will need to choose a particular distro and suite for the guest and all builders must use that particular distro and suite, otherwise the software won't reproduce for everyone. + +The official vmbuilder only includes support for Ubuntu guests, so you need to install [Joseph Bisch's fork of vmbuilder](https://github.com/josephbisch/vmbuilder), which adds a Debian plugin. + +To create a Debian guest: + + bin/make-base-vm --distro debian --suite jessie + +There is currently no support for LXC Debian guests. There is just KVM support. LXC support for Debian guests is planned to be added soon. + +Only Debian Jessie guests have been tested with Gitian. Debian Jessie is the current stable release of Debian at this time. If you have success (or trouble) with other versions of Debian, please let us know. + +If you are creating a Gitian descriptor, you can now specify a distro. If no distro is provided, the default is to assume Ubuntu. Since Ubuntu is assumed, older Gitian descriptors that don't specify a distro will still work as they always have. + ## Create the base VM for use in further builds **NOTE:** requires `sudo`, please review the script @@ -88,6 +104,10 @@ If you have everything set-up properly, you should be able to: PATH=$PATH:$(pwd)/libexec make-clean-vm --suite lucid --arch i386 + # on-target needs $DISTRO to be set to debian if using a Debian guest + # (when running gbuild, $DISTRO is set based on the descriptor, so this line isn't needed) + DiSTRO=debian + # For LXC: LXC_ARCH=i386 LXC_SUITE=lucid on-target ls -la @@ -128,7 +148,7 @@ After you've merged everybody's signatures, verify them: * Log files are captured to the _var_ directory * You can run the utilities in libexec by running `PATH="libexec:$PATH"` * To start the target VM run `start-target 32 lucid-i386` or `start-target 64 lucid-amd64` -* To ssh into the target run `on-target` or `on-target -u root` +* To ssh into the target run `on-target` (after setting $DISTRO to debian if using a Debian guest) or `on-target -u root` * On the target, the _build_ directory contains the code as it is compiled and _install_ contains intermediate libraries * By convention, the script in `<package>.yml` starts with any environment setup you would need to manually compile things on the target diff --git a/bin/gbuild b/bin/gbuild index d256986..0171ccf 100755 --- a/bin/gbuild +++ b/bin/gbuild @@ -180,10 +180,13 @@ FileUtils.mkdir_p(result_dir) package_name = build_desc["name"] or raise "must supply name" package_name = sanitize(package_name, "package name") +distro = build_desc["distro"] || "ubuntu" suites = build_desc["suites"] or raise "must supply suites" archs = build_desc["architectures"] or raise "must supply architectures" reference_datetime = build_desc["reference_datetime"] or raise "must supply reference_datetime" +ENV['DISTRO'] = distro + desc_sum = `sha256sum #{build_desc_file}` desc_sum = desc_sum.sub(build_desc_file, "#{package_name}-desc.yml") in_sums << desc_sum diff --git a/bin/make-base-vm b/bin/make-base-vm index 66a3704..1aa8eac 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -1,10 +1,10 @@ #!/bin/sh set -e +DISTRO=ubuntu SUITE=lucid ARCH=amd64 -MIRROR=http://${MIRROR_HOST:-127.0.0.1}:3142/archive.ubuntu.com/ubuntu -SECURITY_MIRROR=http://${MIRROR_HOST:-127.0.0.1}:3142/security.ubuntu.com/ubuntu +MIRROR_BASE=http://${MIRROR_HOST:-127.0.0.1}:3142 LXC=0 VBOX=0 @@ -13,11 +13,12 @@ usage() { echo "Make a base client." echo cat << EOF - --help display this help and exit - --suite U build suite U instead of lucid - --arch A build architecture A (e.g. i386) instead of amd64 - --lxc use lxc instead of kvm - --vbox use VirtualBox instead of kvm + --help display this help and exit + --distro D build distro D (e.g. debian) instead of ubuntu + --suite U build suite U instead of lucid + --arch A build architecture A (e.g. i386) instead of amd64 + --lxc use lxc instead of kvm + --vbox use VirtualBox instead of kvm EOF } @@ -28,6 +29,10 @@ if [ $# != 0 ] ; then usage exit 0 ;; + --distro|-d) + DISTRO="$2" + shift 2 + ;; --suite|-s) SUITE="$2" shift 2 @@ -55,6 +60,19 @@ if [ $# != 0 ] ; then done fi +if [ $DISTRO = "debian" -a $LXC = "1" ]; then + echo "There is no support for Debian guests using LXC currently. Please use KVM or another distro for now." + exit 1 +fi + +if [ $DISTRO = "ubuntu" ]; then + MIRROR=$MIRROR_BASE/archive.ubuntu.com/ubuntu + SECURITY_MIRROR=$MIRROR_BASE/security.ubuntu.com/ubuntu +elif [ $DISTRO = "debian" ]; then + MIRROR=$MIRROR_BASE/ftp.debian.org/debian + SECURITY_MIRROR=$MIRROR_BASE/security.debian.org/ +fi + mkdir -p var if [ ! -e var/id_dsa ]; then @@ -68,7 +86,47 @@ if [ $ARCH = "amd64" -a $SUITE = "hardy" ]; then FLAVOUR=server fi -addpkg=openssh-server,pciutils,build-essential,git-core,subversion,lxc +if [ $DISTRO = "debian" -a $ARCH = "amd64" ]; then + FLAVOUR=amd64 +elif [ $DISTRO = "debian" -a $ARCH = "i386" -a $$SUITE = "squeeze" -o $SUITE = "lenny" -o $SUITE = "etch" -o $SUITE = "sarge" -o $SUITE = "woody" -o $SUITE = "potato" -o $SUITE = "slink" -o $SUITE = "hamm" -o $SUITE = "bo" -o $SUITE = "rex" -o $SUITE = "buzz"$ ]; then + FLAVOUR=686 +elif [ $DISTRO = "debian" ]; then + FLAVOUR=686-pae +fi + +LOCALE_PKG=language-pack-en +if [ $DISTRO = "debian" ]; then + LOCALE_PKG=locales +fi + +addpkg=pciutils,build-essential,git-core,subversion,$LOCALE_PKG,wget,lsb-release + +if [ $DISTRO = "ubuntu" ]; then + # Need comma at end to work around an issue with apt for Debian <= Wheezy regarding empty strings + # + # If we left the comma down below when adding KERNEL_PKG to addpkg, the fact that KERNEL_PKG is undefined + # if DISTRO is debian would result in two commas in a row (,,), which is interpreted by apt-get as the + # package with the name empty string (""). This triggers a bug with apt versions < 1.0.3. So by adding the + # comma to the end of KERNEL_PKG, we are including that comma if the distro is ubuntu (and therefore we do + # have a kernel package that needs to be installed). If KERNEL_PKG is not set (i.e. we have Debian as the + # distro), then we don't add that extra comma and therefore, we don't end up with two commas in a row. + # + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744940 + # http://anonscm.debian.org/cgit/apt/apt.git/commit/?h=1.0.3&id=d99854cac4065… + KERNEL_PKG=linux-image-generic, +fi + +GRUB_PKG=grub +if [ $DISTRO = "ubuntu" ]; then + GRUB_PKG=grub-pc +fi + +if [ $LXC = "1" ]; then + addpkg=$addpkg,lxc +else + # Lack of comma after KERNEL_PKG is not a typo + addpkg=$addpkg,${KERNEL_PKG}${GRUB_PKG},openssh-server +fi # Remove cron to work around vmbuilder issue when umounting /dev on target removepkg=cron @@ -84,8 +142,8 @@ if [ $VBOX = "1" ]; then vagrant ssh "$NAME" -c "sudo mkdir -p /root/.ssh && sudo chmod 700 /root/.ssh" vagrant ssh "$NAME" -c "sudo sh -c 'cat >> /root/.ssh/authorized_keys'" < var/id_dsa.pub - vagrant ssh "$NAME" -c "sudo -u ubuntu mkdir -p /home/ubuntu/.ssh && sudo -u ubuntu chmod 700 /home/ubuntu/.ssh" - vagrant ssh "$NAME" -c "sudo sh -c 'cat >> /home/ubuntu/.ssh/authorized_keys'" < var/id_dsa.pub + vagrant ssh "$NAME" -c "sudo -u $DISTRO mkdir -p /home/$DISTRO/.ssh && sudo -u $DISTRO chmod 700 /home/$DISTRO/.ssh" + vagrant ssh "$NAME" -c "sudo sh -c 'cat >> /home/$DISTRO/.ssh/authorized_keys'" < var/id_dsa.pub VBoxManage snapshot "Gitian-$NAME" take "Gitian-Clean" vagrant suspend "$NAME" @@ -99,7 +157,7 @@ if [ -e $OUT.qcow2 ]; then fi rm -rf $OUT -sudo vmbuilder kvm ubuntu --rootsize 15360 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup +sudo vmbuilder kvm $DISTRO --rootsize 15360 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT @@ -114,4 +172,3 @@ if [ $LXC = "1" ]; then rm -f $OUT.raw # bootstrap-fixup is done in libexec/make-clean-vm fi - diff --git a/libexec/copy-from-target b/libexec/copy-from-target index f82da66..5372bb9 100755 --- a/libexec/copy-from-target +++ b/libexec/copy-from-target @@ -2,7 +2,7 @@ . gconfig -TUSER=ubuntu +TUSER=${DISTRO:-ubuntu} QUIET_FLAG= usage() { diff --git a/libexec/copy-to-target b/libexec/copy-to-target index f9d900e..df45812 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -2,7 +2,7 @@ . gconfig -TUSER=ubuntu +TUSER=${DISTRO:-ubuntu} QUIET_FLAG= usage() { diff --git a/libexec/on-target b/libexec/on-target index ae653bd..fe56fee 100755 --- a/libexec/on-target +++ b/libexec/on-target @@ -4,7 +4,7 @@ set -e . gconfig -TUSER=ubuntu +TUSER=${DISTRO:-ubuntu} usage() { echo "Usage: ${0##*/} [OPTION]... <command>" diff --git a/target-bin/bootstrap-fixup b/target-bin/bootstrap-fixup index ccbb977..d371072 100755 --- a/target-bin/bootstrap-fixup +++ b/target-bin/bootstrap-fixup @@ -2,7 +2,8 @@ set -e -. /etc/lsb-release +DISTRIB_NAME=`lsb_release -is` +DISTRIB_CODENAME=`lsb_release -cs` ip=`hostname --all-ip-addresses | cut -d ' ' -f1 | cut -d. -f1-3` @@ -14,5 +15,16 @@ else MIRROR_HOST_ON_GUEST=${MIRROR_HOST_ON_GUEST:-10.0.2.2} fi -echo "deb http://$MIRROR_HOST_ON_GUEST:3142/archive.ubuntu.com/ubuntu $DISTRIB_CODENAME main universe" > $1/etc/apt/sources.list -echo "deb http://$MIRROR_HOST_ON_GUEST:3142/archive.ubuntu.com/ubuntu $DISTRIB_CODENAME-updates main universe" >> $1/etc/apt/sources.list +if [ $DISTRIB_NAME = "Ubuntu" ]; then + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/archive.ubuntu.com/ubuntu $DISTRIB_CODENAME main universe" > $1/etc/apt/sources.list + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/security.ubuntu.com/ubuntu $DISTRIB_CODENAME-security main universe" >> $1/etc/apt/sources.list + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/archive.ubuntu.com/ubuntu $DISTRIB_CODENAME-updates main universe" >> $1/etc/apt/sources.list +elif [ $DISTRIB_NAME = "Debian" ]; then + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/ftp.debian.org/debian $DISTRIB_CODENAME main" > $1/etc/apt/sources.list + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/security.debian.org/ $DISTRIB_CODENAME/updates main" >> $1/etc/apt/sources.list + echo "deb http://$MIRROR_HOST_ON_GUEST:3142/ftp.debian.org/debian $DISTRIB_CODENAME-updates main" >> $1/etc/apt/sources.list + # grub-legacy conflicts grub-pc dependencies + # No grub-legacy on Ubuntu, just on Debian + # Work around bcron-run conflict due to cron being removed + apt-get purge -y grub-legacy bcron-run &> /dev/null +fi

1 0