December 2016 - tor-commits - lists.torproject.org

[sandboxed-tor-browser/master] Allow ugetrlimit, and remove the getrlimit hook.
by yawning＠torproject.org 03 Dec '16

03 Dec '16

commit b8534e56ad75c4b66783c8b14fcc8cf38687a6c5 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Dec 3 23:28:48 2016 +0000 Allow ugetrlimit, and remove the getrlimit hook. I still have no idea, but at this point I'm going to write it off to: "My system call whitelist didn't have enough things on it for i386". --- data/tor-whitelist-extras-i386.seccomp | 2 ++ ...rbrowser-launcher-whitelist-extras-i386.seccomp | 1 + src/tbb_stub/tbb_stub.c | 28 ++-------------------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/data/tor-whitelist-extras-i386.seccomp b/data/tor-whitelist-extras-i386.seccomp index 03204c3..b3a13f7 100644 --- a/data/tor-whitelist-extras-i386.seccomp +++ b/data/tor-whitelist-extras-i386.seccomp @@ -13,6 +13,8 @@ mmap2: 1 fcntl64: 1 stat64: 1 +ugetrlimit: 1 + # tor's sandbox code claims that these calls are required on x86 but not on # x86_64. tor's sandbox attempts to filter socketcall's arguments as well # when it adds a rule, but seccomp on x86 does not support argument filtering, diff --git a/data/torbrowser-launcher-whitelist-extras-i386.seccomp b/data/torbrowser-launcher-whitelist-extras-i386.seccomp index 4d685b6..b859f69 100644 --- a/data/torbrowser-launcher-whitelist-extras-i386.seccomp +++ b/data/torbrowser-launcher-whitelist-extras-i386.seccomp @@ -19,6 +19,7 @@ getresgid32: 1 time: 1 getuid32: 1 getgid32: 1 +ugetrlimit: 1 recv: 1 send: 1 diff --git a/src/tbb_stub/tbb_stub.c b/src/tbb_stub/tbb_stub.c index e431222..0f714b7 100644 --- a/src/tbb_stub/tbb_stub.c +++ b/src/tbb_stub/tbb_stub.c @@ -48,10 +48,7 @@ #include <stdlib.h> #include <X11/Xlib.h> -#ifdef __i386__ -#include <sys/time.h> -#include <sys/resource.h> -#else +#ifndef __i386__ #include <glob.h> #include <stdbool.h> #endif @@ -179,28 +176,7 @@ XQueryExtension(Display *display, _Xconst char *name, int *major, int *event, in return real_XQueryExtension(display, name, major, event, error); } -#ifdef __i386__ - -static int (*real_getrlimit)(__rlimit_resource_t, struct rlimit *); - -int -getrlimit(__rlimit_resource_t resource, struct rlimit *rlim) -{ - /* I have no fucking idea why, on i386 systems rlimit starts failing - * randomly deep inside firefox, even with the appropriate system calls - * whitelisted. Hooking it, makes the problem go away for extra fun. - */ - if (real_getrlimit == NULL) { - if ((real_getrlimit = dlsym(RTLD_NEXT, "getrlimit")) == NULL) { - fprintf(stderr, "ERROR: Failed to find `getrlimit() symbol: %s\n", dlerror()); - abort(); - } - } - - return real_getrlimit(resource, rlim); -} - -#else +#ifndef __i386__ typedef struct pa_mutex pm; static pm* (*real_pa_mutex_new)(bool, bool);

1 0

[sandboxed-tor-browser/master] Unbreak audio on Fedora 24 (i386).
by yawning＠torproject.org 03 Dec '16

03 Dec '16

commit 97b9b90a5c7957066ce19c928b00a5f3dc2f1ea5 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Dec 3 23:08:08 2016 +0000 Unbreak audio on Fedora 24 (i386). --- data/torbrowser-launcher-whitelist-extras-i386.seccomp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/torbrowser-launcher-whitelist-extras-i386.seccomp b/data/torbrowser-launcher-whitelist-extras-i386.seccomp index 029d63f..4d685b6 100644 --- a/data/torbrowser-launcher-whitelist-extras-i386.seccomp +++ b/data/torbrowser-launcher-whitelist-extras-i386.seccomp @@ -17,6 +17,8 @@ set_thread_area: 1 getresuid32: 1 getresgid32: 1 time: 1 +getuid32: 1 +getgid32: 1 recv: 1 send: 1

1 0

[sandboxed-tor-browser/master] Add more missing calls to the i386 seccomp whitelist.
by yawning＠torproject.org 03 Dec '16

03 Dec '16

commit ce5890877fe9febb1758c0ed001d37a60e4689ef Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Dec 3 22:45:27 2016 +0000 Add more missing calls to the i386 seccomp whitelist. --- data/torbrowser-launcher-whitelist-extras-i386.seccomp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/torbrowser-launcher-whitelist-extras-i386.seccomp b/data/torbrowser-launcher-whitelist-extras-i386.seccomp index d00383f..029d63f 100644 --- a/data/torbrowser-launcher-whitelist-extras-i386.seccomp +++ b/data/torbrowser-launcher-whitelist-extras-i386.seccomp @@ -8,9 +8,15 @@ statfs64: 1 stat64: 1 prlimit64: 1 _llseek: 1 +fstatfs64: 1 +ftruncate64: 1 +fadvise64_64: 1 mmap2: 1 set_thread_area: 1 +getresuid32: 1 +getresgid32: 1 +time: 1 recv: 1 send: 1

1 0

[sandboxed-tor-browser/master] Disable PI futex calls in the Tor Browser sandbox (x86_64).
by yawning＠torproject.org 03 Dec '16

03 Dec '16

commit af2f433511ba613c7139709d2abebdba6820e8ca Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Dec 3 21:32:34 2016 +0000 Disable PI futex calls in the Tor Browser sandbox (x86_64). There are rumors that PI futexes have scary race conditions, that enable an exploit that is being sold by the forces of darkness. On systems where we can filter futex kernel args, we reject such calls. However this breaks PulseAudio, because PI futex usage is determined at compile time. This fixes up the mutex creation call, to never request PI mutexes. Thanks to the unnamed reporter who filed the issues on the tails, bug tracker and chatted with me on IRC about it. Note: This could be enabled unconditionally (ie: also on x86), but since that platform doesn't filter syscalls by argument due to seccomp-bpf limitations, it seems somewhat pointless. See: https://labs.riseup.net/code/issues/11524 --- data/torbrowser-launcher-whitelist.seccomp | 29 +++++++- .../internal/sandbox/application.go | 9 +++ src/tbb_stub/tbb_stub.c | 81 ++++++++++++++++++++++ 3 files changed, 117 insertions(+), 2 deletions(-) diff --git a/data/torbrowser-launcher-whitelist.seccomp b/data/torbrowser-launcher-whitelist.seccomp index f47a290..7e47052 100644 --- a/data/torbrowser-launcher-whitelist.seccomp +++ b/data/torbrowser-launcher-whitelist.seccomp @@ -1,7 +1,32 @@ TIOCGPGRP=21519 -# futex: FUTEX_CMP_REQUEUE_PRIVATE || FUTEX_LOCK_PI_PRIVATE || FUTEX_UNLOCK_PI_PRIVATE || FUTEX_WAIT || FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME || FUTEX_WAIT_PRIVATE || FUTEX_WAKE || FUTEX_WAKE_OP_PRIVATE || FUTEX_WAKE_PRIVATE || FUTEX_WAIT_BITSET_PRIVATE || FUTEX_UNLOCK_PI -futex: arg1 == 0 || arg1 == 128 || arg1 == 129 || arg1 == 132 || arg1 == 133 || arg1 == 393 || arg1 == 134 || arg1 == 1 || arg1 == 135 || arg1 == 139 || arg1 == 140 || arg1 == 137 || arg1 == 7 +FUTEX_WAIT=0 +FUTEX_WAKE=1 +FUTEX_FD=2 +FUTEX_REQUEUE=3 +FUTEX_CMP_REQUEUE=3 +FUTEX_WAKE_OP=5 +#FUTEX_LOCK_PI=6 +#FUTEX_UNLOCK_PI=7 +FUTEX_WAIT_BITSET=9 +FUTEX_PRIVATE_FLAG=128 +FUTEX_CLOCK_REALTIME=256 + +FUTEX_WAIT_PRIVATE=FUTEX_WAIT | FUTEX_PRIVATE_FLAG +FUTEX_WAKE_PRIVATE=FUTEX_WAKE | FUTEX_PRIVATE_FLAG +FUTEX_CMP_REQUEUE_PRIVATE=FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG +FUTEX_WAKE_OP_PRIVATE=FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG +#FUTEX_LOCK_PI_PRIVATE=FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG +#FUTEX_UNLOCK_PI_PRIVATE=FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG +FUTEX_WAIT_BITSET_PRIVATE=FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG + +# XXX/yawning: Because we patch PulseAudio's mutex creation, we can omit +# FUTEX_LOCK_PI_PRIVATE, FUTEX_UNLOCK_PI_PRIVATE, FUTEX_UNLOCK_PI. +# +# This is deliberate and aims to avoid rumored scary race conditions in the +# PI futex code. +futex: arg1 == FUTEX_CMP_REQUEUE_PRIVATE || arg1 == FUTEX_WAIT || arg1 == FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME || arg1 == FUTEX_WAIT_PRIVATE || arg1 == FUTEX_WAKE || arg1 == FUTEX_WAKE_OP_PRIVATE || arg1 == FUTEX_WAKE_PRIVATE || arg1 == FUTEX_WAIT_BITSET_PRIVATE + lseek: 1 open: 1 read: 1 diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 6ce948e..edac173 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -232,6 +232,15 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (cm ldLibraryPath = ldLibraryPath + ":" + paLibsPath h.roBind(paLibsPath, restrictedPulseDir, false) extraLdLibraryPath = extraLdLibraryPath + ":" + restrictedPulseDir + + matches, err := filepath.Glob(paLibsPath + "/*.so") + if err != nil { + return nil, err + } + for _, v := range matches { + _, f := filepath.Split(v) + extraLibs = append(extraLibs, f) + } } else { log.Printf("sandbox: Failed to find pulse audio libraries.") } diff --git a/src/tbb_stub/tbb_stub.c b/src/tbb_stub/tbb_stub.c index 7e2bb1f..e431222 100644 --- a/src/tbb_stub/tbb_stub.c +++ b/src/tbb_stub/tbb_stub.c @@ -51,6 +51,9 @@ #ifdef __i386__ #include <sys/time.h> #include <sys/resource.h> +#else +#include <glob.h> +#include <stdbool.h> #endif static pthread_once_t stub_init_once = PTHREAD_ONCE_INIT; @@ -177,6 +180,7 @@ XQueryExtension(Display *display, _Xconst char *name, int *major, int *event, in } #ifdef __i386__ + static int (*real_getrlimit)(__rlimit_resource_t, struct rlimit *); int @@ -195,6 +199,83 @@ getrlimit(__rlimit_resource_t resource, struct rlimit *rlim) return real_getrlimit(resource, rlim); } + +#else + +typedef struct pa_mutex pm; +static pm* (*real_pa_mutex_new)(bool, bool); + +static char * +glob_library(const char *lib_glob) { + glob_t gb; + char *lib = NULL; + size_t i; + + if (glob(lib_glob, GLOB_MARK, NULL, &gb) != 0) { + return NULL; + } + + for (i = 0; i < gb.gl_pathc; i++) { + const char *path = gb.gl_pathv[i]; + size_t plen = strlen(path); + + if (plen > 0 && path[plen] != '/') { + lib = strndup(path, plen); + break; + } + } + + globfree(&gb); + + return lib; +} + +/* There are rumors that PI futexes have scary race conditions, that enable + * an exploit that is being sold by the forces of darkness. On systems where + * we can filter futex kernel args, we reject such calls. + * + * However this breaks PulseAudio, because PI futex usage is determined at + * compile time. This fixes up the mutex creation call, to never request PI + * mutexes. + * + * Thanks to the unnamed reporter who filed the issues on the tails, bug + * tracker and chatted with me on IRC about it. + * See: https://labs.riseup.net/code/issues/11524 + * + * Note: This could be enabled unconditionally (ie: also on x86), but since + * that platform doesn't filter syscalls by argument due to seccomp-bpf + * limitations, it seems somewhat pointless. + */ +pm * +pa_mutex_new(bool recursive, bool inherit_priority) { + (void) inherit_priority; + + pthread_once(&stub_init_once, stub_init); + + if (real_pa_mutex_new == NULL) { + void *handle; + char *lib; + + if ((lib = glob_library("/usr/lib/pulseaudio/libpulsecore-*.so")) == NULL) { + fprintf(stderr, "ERROR: Failed to find `libpulsecore-*.so`"); + abort(); + } + + if ((handle = real_dlopen(lib, RTLD_LAZY|RTLD_LOCAL)) == NULL) { + fprintf(stderr, "ERROR: Failed to dlopen() libpulsecore.so: %s\n", dlerror()); + abort(); + } + free(lib); + + if ((real_pa_mutex_new = dlsym(handle, "pa_mutex_new")) == NULL) { + fprintf(stderr, "ERROR: Failed to find `pa_mutex_new()` symbol: %s\n", dlerror()); + abort(); + } + dlclose(handle); + } + return real_pa_mutex_new(recursive, false); +} + #endif /* Initialize the stub. */

1 0

[tor-messenger-build/master] Permit storing cert exceptions in private browsing mode
by arlo＠torproject.org 03 Dec '16

03 Dec '16

commit 8658c44f5fd2e9881e676488098aa4fb38ceced1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Dec 3 10:07:46 2016 -0800 Permit storing cert exceptions in private browsing mode --- ChangeLog | 1 + ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 10 ++++----- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 6 +++--- ...Avoid-the-need-to-download-the-font-Osaka.patch | 8 ++++---- ...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 10 ++++----- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 6 +++--- projects/mozilla/0006-Updater-fixups-for-TM.patch | 10 ++++----- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 24 ++++++++++++++++++++++ projects/mozilla/config | 1 + 9 files changed, 51 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78e111c..fdb0def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Tor Messenger 0.3.0b2 -- * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update tor-browser to 6.0.7 * Don't allow javascript: links in themes + * Permit storing cert. exceptions in private browsing mode * Bugzilla 1321420: Add a pref to disable JavaScript in browser requests * Bugzilla 1321641: Disable svg and mathml in content diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 93e415b..51b38dd 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,7 +1,7 @@ From bd289165bfce9d0239d67571755cee1048e9433b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 -Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP +Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP * Revert "Bug #3875: Use Optimistic Data SOCKS variant." @@ -13,7 +13,7 @@ This reverts commit 9064546a5e54d94054d944dd910a5db3a67032dc. 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp -index c35a587..6a758f9 100644 +index c35a587830d8..6a758f9acaad 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -1887,26 +1887,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) @@ -86,7 +86,7 @@ index c35a587..6a758f9 100644 mCondition = ErrorAccordingToNSPR(code); } diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h -index b7fbc76..b508335 100644 +index b7fbc76a79a8..b508335c7e55 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h @@ -190,9 +190,7 @@ private: @@ -101,7 +101,7 @@ index b7fbc76..b508335 100644 // Safer way to get and automatically release PRFileDesc objects. diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp -index 568c700..1793001 100644 +index 568c700e2bae..1793001df2c9 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -79,9 +79,7 @@ public: @@ -116,5 +116,5 @@ index 568c700..1793001 100644 private: -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 10f6209..afd5a37 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,7 +1,7 @@ From a37fd7380b807ff8e4cebaef8a5817c670816091 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 -Subject: [PATCH 2/6] Trac 16475: Block flash too +Subject: [PATCH 2/7] Trac 16475: Block flash too * Builds on "Bug #3547: Block all plugins except flash." --- @@ -9,7 +9,7 @@ Subject: [PATCH 2/6] Trac 16475: Block flash too 1 file changed, 9 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 5345ce7..1569236 100644 +index 5345ce7c8764..15692365ee63 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -2081,15 +2081,6 @@ PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) @@ -29,5 +29,5 @@ index 5345ce7..1569236 100644 } -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index e0eb945..8a60703 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,7 +1,7 @@ From 39f09114b425a248516f27296a57b91978d47b81 Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 -Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka +Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka * Bug 1283573 - Don't attempt to look up a single-face-family name if the corresponding main family isn't available. r=mstange @@ -11,7 +11,7 @@ Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm -index eb7a788..5c63e69 100644 +index eb7a7889ae6a..5c63e698726a 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -735,15 +735,24 @@ gfxMacPlatformFontList::InitSingleFaceList() @@ -44,7 +44,7 @@ index eb7a788..5c63e69 100644 LOG_FONTLIST(("(fontlist-singleface) family name: %s, key: %s\n", NS_ConvertUTF16toUTF8(familyName).get(), diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index e855cdb..2891c80 100644 +index e855cdbcb949..2891c804601d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3577,9 +3577,9 @@ pref("font.name.monospace.x-math", "Courier"); @@ -61,5 +61,5 @@ index e855cdb..2891c80 100644 // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss // names are canonical family names (typically English names) -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 6598c3a..f656910 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,7 +1,7 @@ From 074aeb6d15c5098991d0d7e652eddbf3b72f91d7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 -Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 +Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 * We're reverting the patch, "Adjust atomic ops code to be more compatible with thread sanitizer tools." @@ -14,7 +14,7 @@ Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h -index 55ec0ae..ac083b0 100644 +index 55ec0ae6ece5..ac083b0e449f 100644 --- a/intl/icu/source/common/putilimp.h +++ b/intl/icu/source/common/putilimp.h @@ -1,7 +1,7 @@ @@ -49,7 +49,7 @@ index 55ec0ae..ac083b0 100644 /*===========================================================================*/ /** @{ Programs used by ICU code */ diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp -index 69eab79..dff0b47 100644 +index 69eab79ff945..dff0b4723736 100644 --- a/intl/icu/source/common/umutex.cpp +++ b/intl/icu/source/common/umutex.cpp @@ -344,8 +344,8 @@ umtx_atomic_dec(u_atomic_int32_t *p) { @@ -73,7 +73,7 @@ index 69eab79..dff0b47 100644 U_NAMESPACE_END diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h -index 0e4d118..e0ad0d3 100644 +index 0e4d118523c8..e0ad0d3c0365 100644 --- a/intl/icu/source/common/umutex.h +++ b/intl/icu/source/common/umutex.h @@ -1,6 +1,6 @@ @@ -119,5 +119,5 @@ index 0e4d118..e0ad0d3 100644 /* * gcc atomic ops. These are available on several other compilers as well. -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 5272b75..ce20f8e 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,14 +1,14 @@ From a758107c5d793f0bfb686a5b60c70037b8ebf1bb Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 -Subject: [PATCH 5/6] OSX: package as tar.bz2 +Subject: [PATCH 5/7] OSX: package as tar.bz2 --- toolkit/mozapps/installer/upload-files.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk -index 5c11ed2..0c7bf28 100644 +index 5c11ed2ef2ec..0c7bf282baab 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -4,7 +4,7 @@ @@ -21,5 +21,5 @@ index 5c11ed2..0c7bf28 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index fd54e53..6a8ad5a 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,7 +1,7 @@ From 63d8e00c912bdbe1c336ecf4276e123d59c41be3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 -Subject: [PATCH 6/6] Updater fixups for TM +Subject: [PATCH 6/7] Updater fixups for TM * Remove updater links @@ -526,7 +526,7 @@ z<Hj~T<`88N3sa$~O~s4yQz$7wxFYzlvl`kV4U7(93})ejnwEPfj7PS+Eo(dWGOA)$ lxF+BV*FuA*n)rXh{eOL`E@}ETfW-g+002ovPDHLkV1nm~vr+&6 diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js -index 40e76c8..5565b9c 100644 +index 40e76c889234..5565b9c54f8c 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -979,7 +979,7 @@ var gUpdatesFoundBasicPage = { @@ -539,7 +539,7 @@ index 40e76c8..5565b9c 100644 updateMoreInfoURL.hidden = true; diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul -index 6066802..c82bc77 100644 +index 6066802a65af..c82bc77ce8a7 100644 --- a/toolkit/mozapps/update/content/updates.xul +++ b/toolkit/mozapps/update/content/updates.xul @@ -121,8 +121,7 @@ @@ -693,7 +693,7 @@ zHAIICCiYIYSX`mIUcOp4Id^^h+f`jW<`?chRNi!yt6Nd*2j3*8u$&(cmR(l9;<#d+ W@ahR1{w+qA19CVV{J*b~TmS$gHy@k; diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp -index c45961a..23d6fbe 100644 +index c45961ac54e7..23d6fbe2929a 100644 --- a/xpcom/io/TorFileUtils.cpp +++ b/xpcom/io/TorFileUtils.cpp @@ -16,7 +16,7 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile) @@ -706,5 +706,5 @@ index c45961a..23d6fbe 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.10.2 +2.11.0 diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch new file mode 100644 index 0000000..c976f0d --- /dev/null +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -0,0 +1,24 @@ +From 943386570317551f9e2540e8a90ed7f5c8ce9b45 Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra(a)gmail.com> +Date: Sat, 3 Dec 2016 10:01:52 -0800 +Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode + +--- + security/manager/pki/resources/content/exceptionDialog.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/security/manager/pki/resources/content/exceptionDialog.js b/security/manager/pki/resources/content/exceptionDialog.js +index 640791f898fc..a8abfe9886c4 100644 +--- a/security/manager/pki/resources/content/exceptionDialog.js ++++ b/security/manager/pki/resources/content/exceptionDialog.js +@@ -356,5 +356,6 @@ function addException() { + * Returns true if this dialog is in private browsing mode. + */ + function inPrivateBrowsingMode() { +- return PrivateBrowsingUtils.isWindowPrivate(window); ++ // Let us store exceptions in private browsing mode. ++ return false; // PrivateBrowsingUtils.isWindowPrivate(window); + } +-- +2.11.0 + diff --git a/projects/mozilla/config b/projects/mozilla/config index ec93ff5..6d5f826 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -12,3 +12,4 @@ input_files: - filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch - filename: 0005-OSX-package-as-tar.bz2.patch - filename: 0006-Updater-fixups-for-TM.patch + - filename: 0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch

1 0

[torbirdy/master] Update the README file
by sukhbir＠torproject.org 03 Dec '16

03 Dec '16

commit 8578d1ea228a549e27bfdf4e78344d4c27cb17a1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Dec 3 12:35:38 2016 -0500 Update the README file --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index aa196be..c1b89bf 100644 --- a/README +++ b/README @@ -1,6 +1,5 @@ TorBirdy is an extension that brings safe Tor support to Thunderbird. -In theory, it should work with Icedove as well as other Thunderbird forks. +Visit the wiki to get started: -Current home page: https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[torbirdy/master] Update README.RELEASE (again)
by sukhbir＠torproject.org 03 Dec '16

03 Dec '16

commit 978fbb2999a0b352b3a0c3141963f8ddf477e537 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Dec 3 12:11:58 2016 -0500 Update README.RELEASE (again) --- README.RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.RELEASE b/README.RELEASE index 58d808a..2eeb827 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -14,8 +14,8 @@ To perform a release for TorBirdy: Upload packages to the Tor Project webserver: Run `push-release` and the packages are uploaded Upload the package to Mozilla's AddOn site manually + Check the Add-ons validation to ensure that there are no errors Write a blog post anouncing the release on the Tor Project blog - Write an email anouncing the release to tor-talk Bump the version number on the wiki and make other relevant changes Announce the release widely in whatever format is reasonable or desired Contact the Debian maintainers to notify them of the new version

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 03 Dec '16

03 Dec '16

commit 919c4ff6c0b41b7be0c673947cc973eb090642aa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 3 13:48:42 2016 +0000 Update translations for tails-greeter-2_completed --- bg/bg.po | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 309 insertions(+) diff --git a/bg/bg.po b/bg/bg.po new file mode 100644 index 0000000..350fc0d --- /dev/null +++ b/bg/bg.po @@ -0,0 +1,309 @@ +# Tails GDM Greeter +# Copyright (C) 2016 Tails devlopers +# This file is distributed under the same license as the tails-greeter package. +# Tails devloppers <tails(a)boum.org>, 2016. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-02 12:10+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: alexdimitrov <kvikmen(a)gmail.com>, 2016\n" +"Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/greeter.ui.h:1 +msgid "Administration Password" +msgstr "Администраторска парола" + +#: ../data/greeter.ui.h:2 +msgid "" +"Set up an administration password if you need to perform administrative " +"tasks. Otherwise, the administration password is disabled for better " +"security." +msgstr "" +"Задаване на администраторска парола, за да могат да бъдат изпълянване задачи" +" изискващи администраторски правомощия. В противен случай паролата ще бъде " +"деактивирана за по-голяма сигурност." + +#: ../data/greeter.ui.h:3 +msgid "Enter an administration password" +msgstr "Въведете администраторска парола" + +#: ../data/greeter.ui.h:4 +msgid "Confirm" +msgstr "Потвърдете" + +#: ../data/greeter.ui.h:5 +msgid "Confirm your administration password" +msgstr "Потвърдете администраторската парола" + +#: ../data/greeter.ui.h:6 +msgid "Disable" +msgstr "Деактивиране" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:8 +msgid "Windows Camouflage" +msgstr "Windows камуфлаж" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:10 +msgid "" +"This option makes Tails look like Microsoft Windows 10. This can be useful " +"to avoid attracting suspiction in public places." +msgstr "" +"Тази опция променя Tails визуално, за да наподобява Microsoft Windows 10. " +"Това е полезно за избягване привличане на вниманието на публични места." + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:12 +msgid "Microsoft Windows 10 camouflage" +msgstr "Microsoft Windows 10 камуфлаж" + +#: ../data/greeter.ui.h:13 +msgid "MAC Address Spoofing" +msgstr "Подправяне на MAC адрес" + +#: ../data/greeter.ui.h:14 +msgid "" +"MAC address spoofing hides the serial number of your network interface (Wi-" +"Fi or wired) to the local network. Spoofing MAC addresses is generally safer" +" as it helps you hide your geographical location. But it might also create " +"connectivity problems or look suspicious." +msgstr "" +"Подправянето на MAC адресa скрива серийнiя номер на вашата мрежова " +"карта(WiFi или кабел) в локалната мрежа. Това засилва сигурността, защото " +"подпомага прикриването на географското Ви местоположение." + +#: ../data/greeter.ui.h:15 +msgid "Spoof all MAC addresses (default)" +msgstr "Подправяне на всички MAC адреси (подразбиране)" + +#: ../data/greeter.ui.h:16 +msgid "Don't spoof MAC addresses" +msgstr "Не подправяй MAC адресите" + +#: ../data/greeter.ui.h:17 +msgid "Welcome to Tails!" +msgstr "Добре дошли в Tails!" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:19 +msgctxt "" +msgid "" +"To get guided through Tails' settings, click on <b>Take a Tour</b> above" +msgstr "" +"За напътствия за настройките на Tails, натиснете <b>Разходка за добре " +"дошли</b> по-горе" + +#: ../data/greeter.ui.h:20 +msgid "Language & Region" +msgstr "Език & регион" + +#: ../data/greeter.ui.h:21 +msgid "Default Settings" +msgstr "Настройки по подразбиране" + +#: ../data/greeter.ui.h:22 +msgid "Save Language & Region Settings" +msgstr "Запазване на настройките за език & регион" + +#: ../data/greeter.ui.h:23 +msgid "Language" +msgstr "Език" + +#: ../data/greeter.ui.h:24 +msgid "Keyboard Layout" +msgstr "Настройки на клавиатурата" + +#: ../data/greeter.ui.h:25 +msgid "Formats" +msgstr "Формати" + +#: ../data/greeter.ui.h:26 +msgid "Time Zone" +msgstr "Времева зона" + +#: ../data/greeter.ui.h:27 +msgid "Encrypted Persistent Storage" +msgstr "Криптирано,постоянно дисково пространство" + +#: ../data/greeter.ui.h:28 +msgid "Show Passphrase" +msgstr "Покажи паролата" + +#: ../data/greeter.ui.h:29 +msgid "Configure Persistent Storage" +msgstr "Настройки на постоянното дисково пространство" + +#: ../data/greeter.ui.h:30 +msgid "Enter your passphrase to unlock the persistent storage" +msgstr "Въведете паролата за отключване на постоянното дисково пространство" + +#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767 +#: ../tailsgreeter/gui.py:928 +msgid "Unlock" +msgstr "Отключване" + +#: ../data/greeter.ui.h:32 +msgid "Relock Persistent Storage" +msgstr "Заключване на постоянното дисково пространство" + +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:492 +msgid "Additional Settings" +msgstr "Допълнителни настройки" + +#: ../data/greeter.ui.h:34 +msgid "Save Additional Settings" +msgstr "Запазване на допълнителните настройки" + +#: ../data/greeter.ui.h:35 +msgid "Add an additional setting" +msgstr "Добавяне на допълнителни настройки" + +#: ../data/greeter.ui.h:36 +msgid "Network Configuration" +msgstr "Настройки на мрежата" + +#: ../data/greeter.ui.h:37 +msgid "" +"If your Internet connection is censored, filtered, or proxied you can " +"configure a Tor bridge or a local proxy. To work completely offline, you can" +" disable all networking." +msgstr "" +"Ако интернет връзката е цензурирана, филтрирана, или използва прокси може да" +" настроите Tor мост или локално прокси. За да работите изцяло офлайн може да" +" деактивирате всички мрежови връзки." + +#: ../data/greeter.ui.h:38 +msgid "Connect directly to the Tor network (default)" +msgstr "Директна връзка с Tor мрежата (подразбиране)" + +#: ../data/greeter.ui.h:39 +msgid "Configure a Tor bridge, firewall, or proxy settings" +msgstr "Задаване на Tor мост, файруол или прокси настройки" + +#: ../data/greeter.ui.h:40 +msgid "Disable all networking" +msgstr "Изключи всички мрежи" + +#: ../data/greeter.ui.h:41 +msgid "" +"The default settings are safe in most situations. To add a custom setting, " +"press the \"+\" button below." +msgstr "" +"Настройките по подразбиране са безопасни в повечето ситуации. За да зададете" +" ръчни настройки натиснете \"+\" бутонът по-долу." + +#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690 +msgid "Off (default)" +msgstr "Изкл (подразбиране)" + +#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688 +msgid "On (default)" +msgstr "Вкл (подразбиране)" + +#: ../data/greeter.ui.h:44 +msgid "Network Connection" +msgstr "Връзка с мрежата" + +#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880 +msgid "Direct (default)" +msgstr "Директна (подразбиране)" + +#: ../tailsgreeter/gui.py:436 +msgid "Shutdown" +msgstr "Изключване" + +#: ../tailsgreeter/gui.py:442 +msgid "Start Tails" +msgstr "Стартиране на Tails" + +#: ../tailsgreeter/gui.py:501 +msgid "Cancel" +msgstr "Откажи" + +#: ../tailsgreeter/gui.py:505 +msgid "Add" +msgstr "Добави" + +#: ../tailsgreeter/gui.py:511 +msgid "Back" +msgstr "Назад" + +#: ../tailsgreeter/gui.py:627 +msgid "Unlocking…" +msgstr "Отключване..." + +#: ../tailsgreeter/gui.py:653 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Ще настроите Tor мост и локално прокси по-късно след установяване на връзка " +"с мрежата." + +#: ../tailsgreeter/gui.py:693 +msgid "On" +msgstr "Вкл" + +#: ../tailsgreeter/gui.py:695 +msgid "Off" +msgstr "Изкл" + +#: ../tailsgreeter/gui.py:769 +msgid "Failed to relock persistent storage." +msgstr "Неуспешно заключване на постоянното дисково пространство." + +#: ../tailsgreeter/gui.py:886 +msgid "Bridge & Proxy" +msgstr "Мост & прокси" + +#: ../tailsgreeter/gui.py:892 +msgid "Offline" +msgstr "Извън линия" + +#: ../tailsgreeter/gui.py:931 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "" +"Неуспешно отключване на криптираното дисково пространство със зададената " +"парола." + +#: ../tailsgreeter/persistence.py:94 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stderr}" +msgstr "" +"live-persist върна грешка с код {returncode}:\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:136 ../tailsgreeter/persistence.py:161 +#: ../tailsgreeter/persistence.py:185 +#, python-brace-format +msgid "" +"cryptsetup failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"cryptsetup върна грешка с код {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:205 +#, python-brace-format +msgid "" +"umount failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"umount върна грешка с код {returncode}:\n" +"{stdout}\n" +"{stderr}"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 03 Dec '16

03 Dec '16

commit 9beb5afbcf38a555561c5bbd91170eabfcd6e798 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 3 13:48:38 2016 +0000 Update translations for tails-greeter-2 --- bg/bg.po | 67 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 344f4fb..350fc0d 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -121,56 +121,56 @@ msgstr "Език" #: ../data/greeter.ui.h:24 msgid "Keyboard Layout" -msgstr "" +msgstr "Настройки на клавиатурата" #: ../data/greeter.ui.h:25 msgid "Formats" -msgstr "" +msgstr "Формати" #: ../data/greeter.ui.h:26 msgid "Time Zone" -msgstr "" +msgstr "Времева зона" #: ../data/greeter.ui.h:27 msgid "Encrypted Persistent Storage" -msgstr "" +msgstr "Криптирано,постоянно дисково пространство" #: ../data/greeter.ui.h:28 msgid "Show Passphrase" -msgstr "" +msgstr "Покажи паролата" #: ../data/greeter.ui.h:29 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Настройки на постоянното дисково пространство" #: ../data/greeter.ui.h:30 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Въведете паролата за отключване на постоянното дисково пространство" #: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767 #: ../tailsgreeter/gui.py:928 msgid "Unlock" -msgstr "" +msgstr "Отключване" #: ../data/greeter.ui.h:32 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Заключване на постоянното дисково пространство" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:492 msgid "Additional Settings" -msgstr "" +msgstr "Допълнителни настройки" #: ../data/greeter.ui.h:34 msgid "Save Additional Settings" -msgstr "" +msgstr "Запазване на допълнителните настройки" #: ../data/greeter.ui.h:35 msgid "Add an additional setting" -msgstr "" +msgstr "Добавяне на допълнителни настройки" #: ../data/greeter.ui.h:36 msgid "Network Configuration" -msgstr "" +msgstr "Настройки на мрежата" #: ../data/greeter.ui.h:37 msgid "" @@ -178,14 +178,17 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" +"Ако интернет връзката е цензурирана, филтрирана, или използва прокси може да" +" настроите Tor мост или локално прокси. За да работите изцяло офлайн може да" +" деактивирате всички мрежови връзки." #: ../data/greeter.ui.h:38 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Директна връзка с Tor мрежата (подразбиране)" #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" -msgstr "" +msgstr "Задаване на Tor мост, файруол или прокси настройки" #: ../data/greeter.ui.h:40 msgid "Disable all networking" @@ -196,22 +199,24 @@ msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." msgstr "" +"Настройките по подразбиране са безопасни в повечето ситуации. За да зададете" +" ръчни настройки натиснете \"+\" бутонът по-долу." #: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690 msgid "Off (default)" -msgstr "" +msgstr "Изкл (подразбиране)" #: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688 msgid "On (default)" -msgstr "" +msgstr "Вкл (подразбиране)" #: ../data/greeter.ui.h:44 msgid "Network Connection" -msgstr "" +msgstr "Връзка с мрежата" #: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880 msgid "Direct (default)" -msgstr "" +msgstr "Директна (подразбиране)" #: ../tailsgreeter/gui.py:436 msgid "Shutdown" @@ -219,7 +224,7 @@ msgstr "Изключване" #: ../tailsgreeter/gui.py:442 msgid "Start Tails" -msgstr "" +msgstr "Стартиране на Tails" #: ../tailsgreeter/gui.py:501 msgid "Cancel" @@ -235,29 +240,31 @@ msgstr "Назад" #: ../tailsgreeter/gui.py:627 msgid "Unlocking…" -msgstr "" +msgstr "Отключване..." #: ../tailsgreeter/gui.py:653 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" +"Ще настроите Tor мост и локално прокси по-късно след установяване на връзка " +"с мрежата." #: ../tailsgreeter/gui.py:693 msgid "On" -msgstr "" +msgstr "Вкл" #: ../tailsgreeter/gui.py:695 msgid "Off" -msgstr "" +msgstr "Изкл" #: ../tailsgreeter/gui.py:769 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Неуспешно заключване на постоянното дисково пространство." #: ../tailsgreeter/gui.py:886 msgid "Bridge & Proxy" -msgstr "" +msgstr "Мост & прокси" #: ../tailsgreeter/gui.py:892 msgid "Offline" @@ -266,6 +273,8 @@ msgstr "Извън линия" #: ../tailsgreeter/gui.py:931 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "" +"Неуспешно отключване на криптираното дисково пространство със зададената " +"парола." #: ../tailsgreeter/persistence.py:94 #, python-brace-format @@ -273,6 +282,8 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" +"live-persist върна грешка с код {returncode}:\n" +"{stderr}" #: ../tailsgreeter/persistence.py:136 ../tailsgreeter/persistence.py:161 #: ../tailsgreeter/persistence.py:185 @@ -282,6 +293,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"cryptsetup върна грешка с код {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:205 #, python-brace-format @@ -290,3 +304,6 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"umount върна грешка с код {returncode}:\n" +"{stdout}\n" +"{stderr}"

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 03 Dec '16

03 Dec '16

commit 5d336dc3087913076cc037f63beefc95e2ce2b64 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 3 13:47:30 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- bg/abouttor.properties | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bg/abouttor.properties b/bg/abouttor.properties index 8fcef5b..b4e76ec 100644 --- a/bg/abouttor.properties +++ b/bg/abouttor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Търси <a href="%1$S">сигурно</a> с <a href="%2$S">\nНачална страница</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Търси <a href="%1$S">сигурно</a> с <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html @@ -19,3 +13,10 @@ aboutTor.searchDC.privacy=Търси <a href="%1$S">сигурно</a> с <a hre 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.donate=Дарете сега! +aboutTor.donationBanner.heart=Tor е в сърцето на интернет свободата +aboutTor.donationBanner.tagline1=Милиони хора зависят от Tor онлайн сигурността и личното си пространство +aboutTor.donationBanner.tagline2=Мрежа от хора защитаващи хора +aboutTor.donationBanner.tagline3=Шпиониране = Потисничество +aboutTor.donationBanner.tagline4=Защитаване на журналисти, активисти и лица подаващи сигнали за несправедливост от 2006 насам

1 0