Commit d749b48e authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/testing' into feature/8031-refactor-10-rbb-hook

Conflicts:
	config/chroot_local-hooks/10-tbb

In conflict resolution, also update to TBB 4.0 checksums and url in
tbb-dist-url.txt and tbb-sha256sums.txt.
parents 10a9f9c7 eabc2900
......@@ -41,7 +41,9 @@
/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop
/config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop
/config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop
/config/chroot_local-includes/usr/share/applications/i2p.desktop
/config/chroot_local-includes/usr/share/applications/i2p-browser.desktop
/config/chroot_local-includes/usr/share/applications/tor-browser.desktop
/config/chroot_local-includes/usr/share/applications/tails-about.desktop
/config/chroot_local-includes/usr/share/desktop-directories/Tails.directory
/tmp/
......
......@@ -58,8 +58,12 @@ install_tor_browser() {
ln -s "${f}" "${prep}"/dictionaries/
done
# We don't need the Tor binary (and shared libraries) and
# documentation shipped in the TBB.
# The libstdc++6 package in Wheezy is too old, so we need the
# bundled one.
cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}"
# We don't need the Tor binary, the shared libraries Tor needs
# (but Firefox doesn't) and documentation shipped in the TBB.
rm -r "${prep}"/TorBrowser/Tor "${prep}"/TorBrowser/Docs
# We don't want tor-launcher to be part of the regular browser
......@@ -172,8 +176,7 @@ TBB_TARBALLS="$(grep "\<tor-browser-linux32-.*\.tar.xz$" "${TBB_SHA256SUMS_FILE}
# We'll use the en-US bundle as our basis; only langpacks will be
# installed from the other bundles.
MAIN_TARBALL="$(echo "${TBB_TARBALLS}" | grep -o "tor-browser-linux32-.*_en-US.tar.xz")"
#VERSION="$(echo "${MAIN_TARBALL}" | sed 's/tor-browser-linux32-\(.*\)_en-US.tar.xz/\1/')"
VERSION=tbb-nightly-2014-10-07
VERSION="$(echo "${MAIN_TARBALL}" | sed 's/tor-browser-linux32-\(.*\)_en-US.tar.xz/\1/')"
TBB_DIST_URL_FILE=/usr/share/tails/tbb-dist-url.txt
TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}")/${VERSION}"
......
......@@ -24,7 +24,7 @@ for LANGUAGE in $(find /usr/share/amnesia/browser/searchplugins/locale -maxdepth
LOCALES="$(locales_for_lang "$LANGUAGE")"
if [ -z "$LOCALES" ]; then
echo "Unable to find a matching locale for $LANGUAGE." >&2
continue
exit 1
fi
for LOCALE in $LOCALES; do
mkdir -p "${TBB_INSTALL}"/distribution/searchplugins/locale/$LOCALE
......
......@@ -159,9 +159,7 @@ configure_chroot () {
CLEARNET_EXT="${CLEARNET_PROFILE}"/extensions
mkdir -p "${CLEARNET_EXT}"
cp -Pr "${TBB_PROFILE}"/extensions/langpack-*.xpi \
"${TBB_PROFILE}"/extensions/branding@amnesia.boum.org \
"${CLEARNET_EXT}"
cp -Pr "${TBB_PROFILE}"/extensions/langpack-*.xpi "${CLEARNET_EXT}"
CLEARNET_PREFS="${CLEARNET_PROFILE}"/preferences/prefs.js
mkdir -p "$(dirname "${CLEARNET_PREFS}")"
......
[Desktop Entry]
Name=Tor Browser
Comment=Anonymous Web Browser
GenericName=Anonymous Web Browser
_Name=Tor Browser
_Comment=Anonymous Web Browser
_GenericName=Anonymous Web Browser
Categories=Network;
Icon=/usr/local/lib/tor-browser/browser/icons/mozicon128.png
Terminal=false
......
http://people.torproject.org/~linus/builds/
http://people.torproject.org/~mikeperry/builds
473780a5145859a8d516e76cb27be25b0baf16007ba50cd8ba78a536bc806fc5 tor-browser-linux32-tbb-nightly_ar.tar.xz
3e3d6fd1ea47067fc00625b8cd62d23079ef71dc91734bfb823542c26ce192cf tor-browser-linux32-tbb-nightly_en-US.tar.xz
df4745725e7b3fe99c218166ffbe38eef8e9d636c42b72c8a2b8229fc3bdd83b tor-browser-linux32-tbb-nightly_ru.tar.xz
b624b1f9a16e4ff4cffb3478f63249ed73ae902732b64fca0f183ad73ed1b5ac tor-browser-linux32-tbb-nightly_zh-CN.tar.xz
d43236d3a8b6d9ce17bdc490c5349da7726800113872835e20961609f6cfb0ca tor-browser-linux32-4.0_ar.tar.xz
b1007109555d79fc0b959343bd204b9f19c22e11b42c760a8a4adc7ee0a5cc88 tor-browser-linux32-4.0_de.tar.xz
2511830a5eea5136e90dc14e309f036d5890d728a0ed3dbb557eeee4d733359c tor-browser-linux32-4.0_en-US.tar.xz
7e48ab4d0360ace4e481fb145cf7e11da0fe43cf5518e1285d60390cd777e1aa tor-browser-linux32-4.0_es-ES.tar.xz
560e81777b097a53918d861b5e3864bfcd6641e4be87044b1c9f227266ed9800 tor-browser-linux32-4.0_fa.tar.xz
c28fbad043b66a6fe5d76111232c6bce3a0334f6401c52f152d4941029ac27c5 tor-browser-linux32-4.0_fr.tar.xz
73906106a501a3e9be43d048cd4daaf8146ef9702272661fe40fdaa6378d8ec1 tor-browser-linux32-4.0_it.tar.xz
5497c51bc47d73f047f4b84ff163462134a52e0a3fb511f968df44f3aa65a187 tor-browser-linux32-4.0_ko.tar.xz
c11b8d3b5b8d2488e15c524e85993fbad2261b53a7a16aeee722a0fadeffe28c tor-browser-linux32-4.0_nl.tar.xz
cad5625b18785a11ee49432e858e776a1b1f02d8c0eda9d2e79358fc1d7793a0 tor-browser-linux32-4.0_pl.tar.xz
29f51b4fb9d51ccab2668f2d84e88850e3458c41400369d4da45410af11b981e tor-browser-linux32-4.0_pt-PT.tar.xz
4d23c36fce0f56d4316469ba33c2fa079e7cf2eea6e67c4c8a5b271b72e3ce6d tor-browser-linux32-4.0_ru.tar.xz
463e38b98c93473142d79d65626cc53584c27e77ea799ad2d0702b25d5495093 tor-browser-linux32-4.0_tr.tar.xz
66a00595224dbf2fba1925bcb60e0fb7ae1a6915cb112d903e5f861b68d019f4 tor-browser-linux32-4.0_vi.tar.xz
720e680d42ea939ce2551dbd43559c6960097ae6de45de507da151403dfa5ac9 tor-browser-linux32-4.0_zh-CN.tar.xz
tails (1.2) UNRELEASED; urgency=low
* Dummy entry for next release.
-- Tails developers <tails@boum.org> Thu, 09 Oct 2014 20:47:28 +0200
tails (1.2~rc1) unstable; urgency=medium
* Major new features
......
......@@ -24,5 +24,6 @@ config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in
config/chroot_local-includes/usr/share/applications/tails-about.desktop.in
config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in
config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in
config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in
config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in
config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in
......@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-07-04 13:40+0000\n"
"Last-Translator: 0xidz <ghoucine@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
......@@ -603,6 +603,16 @@ msgstr "إيقاف التشغيل"
msgid "Immediately shut down computer"
msgstr "اوقف تشغيل الكمبيوتر حالاً"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "أبدأ متصفح تور"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "متصفح غير آمن"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "تصفح الانترنت دون اخفاء هويتك"
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-10-07 14:42+0000\n"
"Last-Translator: laia_ <laiaadorio@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/"
......@@ -595,6 +595,16 @@ msgstr "Apaga"
msgid "Immediately shut down computer"
msgstr "Apaga l'ordinador immediatament"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Inicia el navegador Tor"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Navegador Web Insegur"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Navegar per la World Wide Web sense anonimitzar"
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-10-06 13:30+0000\n"
"Last-Translator: A5h8d0wf0x <littleslyfoxie28@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/"
......@@ -599,6 +599,16 @@ msgstr "Vypnout"
msgid "Immediately shut down computer"
msgstr "Okamžitě vypnout počítač"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Nastartovat Tor Browser"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Nebezpečný webový prohlížeč"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Procházet World Wide Web bez anonymity"
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-04-30 09:10+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
......@@ -601,6 +601,16 @@ msgstr "Pŵer bant"
msgid "Immediately shut down computer"
msgstr "Cau lawr y cyfrifiadur ar unwaith"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Cychwyn Porwr Tor"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Porwr We anniogel"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Porwch yr We heb anhysbysrwydd"
......
......@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-06-23 17:11+0000\n"
"Last-Translator: christianflintrup <chr@agge.net>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/"
......@@ -594,6 +594,16 @@ msgstr "Luk ned"
msgid "Immediately shut down computer"
msgstr "Luk computeren ned med det samme"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Start Tor Browser"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Usikker webbrowser"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Surf på internettet uden anonymitet"
......
......@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-10-03 21:42+0000\n"
"Last-Translator: rike\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/"
......@@ -604,6 +604,16 @@ msgstr "Ausschalten"
msgid "Immediately shut down computer"
msgstr "Sofortiges Herunterfahren des Rechners"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Tor-Browser starten"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Unsicherer Internet-Browser"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Das Internet ohne Anonymität durchsuchen"
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-06-02 00:20+0000\n"
"Last-Translator: andromeas <andromeas@hotmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/"
......@@ -602,6 +602,16 @@ msgstr "Απενεργοποίηση"
msgid "Immediately shut down computer"
msgstr "Άμεση απενεργοποίηση υπολογιστή"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Εκκίνηση του Tor Browser"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Μη ασφαλής Browser"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Πλοήγηση στον Παγκόσμιο Ιστό χωρίς ανωνυμία"
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-09-02 09:52+0000\n"
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
......@@ -588,6 +588,16 @@ msgstr "Power Off"
msgid "Immediately shut down computer"
msgstr "Immediately shut down computer"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Start Tor Browser"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Unsafe Web Browser"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Browse the World Wide Web without anonymity"
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-05-29 15:18+0000\n"
"Last-Translator: strel\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/"
......@@ -597,6 +597,16 @@ msgstr "Apagar"
msgid "Immediately shut down computer"
msgstr "Apaga inmediatamente su computadora"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Iniciar Navegador Tor"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Navegador No Seguro"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Navegar la World Wide Web sin anonimato"
......
......@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-08-06 21:00+0000\n"
"Last-Translator: johnholzer <johnholtzer123@gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/torproject/"
......@@ -592,6 +592,16 @@ msgstr "قطع برق رایانه"
msgid "Immediately shut down computer"
msgstr "فورا رایانه را خاموش کن."
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "اجرای مرورگر تور"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "مرورگر وب نا امن."
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "شبکه جهانی را بدون ناشناس بودن مرور کنید."
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-08 22:16+0200\n"
"POT-Creation-Date: 2014-10-10 13:00+0200\n"
"PO-Revision-Date: 2014-07-04 18:46+0000\n"
"Last-Translator: karvjorm <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/"
......@@ -593,6 +593,16 @@ msgstr "Sammuta"
msgid "Immediately shut down computer"
msgstr "Sammuta tietokone välittömästi"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
#, fuzzy
msgid "Tor Browser"
msgstr "Käynnistä Tor-selain"
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
#, fuzzy
msgid "Anonymous Web Browser"
msgstr "Turvaton Web-selain"
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
msgid "Browse the World Wide Web without anonymity"
msgstr "Selaa webbimaailmaa ilman anonymiteettiä"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment