- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 8751adf3f98016212a3aac2d5a12e59b2e425d5a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 16 19:25:57 2014 -0700 fixup! API allows you to get the url bar URI for a channel or nsIDocument. Log the URI of the source doc/channel that failed. --- content/base/src/ThirdPartyUtil.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 55eb316..569201e 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -427,6 +427,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsIURI **aOutput) { nsresult rv = NS_ERROR_NULL_POINTER; + nsCOMPtr<nsIURI> srcURI; if (!aOutput) return rv; @@ -441,6 +442,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // for sure if (aChannel) { rv = GetOriginatingURI(aChannel, aOutput); + aChannel->GetURI(getter_AddRefs(srcURI)); if (NS_SUCCEEDED(rv) && *aOutput) { // At this point, about: and chrome: URLs have been mapped to file: or // jar: URLs. Try to recover the original URL. @@ -467,6 +469,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsCOMPtr<nsIDOMWindow> top; nsCOMPtr<nsIDOMDocument> topDDoc; nsIURI *docURI = nullptr; + srcURI = aDoc->GetDocumentURI(); if (aDoc->GetWindow()) { aDoc->GetWindow()->GetTop(getter_AddRefs(top)); @@ -505,14 +508,19 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console) { nsCString spec; + nsCString srcSpec("unknown"); + + if (srcURI) + srcURI->GetSpec(srcSpec); + if (*aOutput) (*aOutput)->GetSpec(spec); if (spec.Length() > 0) { - nsPrintfCString msg("getFirstPartyURI: no host in first party URI %s", - spec.get()); // TODO: L10N + nsPrintfCString msg("getFirstPartyURI failed for %s: no host in first party URI %s", + srcSpec.get(), spec.get()); // TODO: L10N console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } else { - nsPrintfCString msg("getFirstPartyURI failed: 0x%x", rv); + nsPrintfCString msg("getFirstPartyURI failed for %s: 0x%x", srcSpec.get(), rv); console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #2874. Remove the Components shim introduced by Mozilla Bug #790732.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b81169268271e65b897e4df2a1f58dd2718af1c7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 12 15:14:39 2014 -0700 fixup! Bug #2874. Remove the Components shim introduced by Mozilla Bug #790732. Includes a regression test to ensure the window.Components object is not exposed to untrusted content. --- dom/base/nsDOMClassInfo.cpp | 98 -------------------- js/xpconnect/tests/mochitest/Makefile.in | 3 +- js/xpconnect/tests/mochitest/file_bug790732.html | 56 ----------- js/xpconnect/tests/mochitest/test_bug790732.html | 46 --------- js/xpconnect/tests/mochitest/test_tor_bug2874.html | 25 +++++ toolkit/components/telemetry/Histograms.json | 4 - 6 files changed, 26 insertions(+), 206 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e5fcebf..2a9d5a8 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -4282,98 +4282,6 @@ LocationSetterUnwrapper(JSContext *cx, JS::Handle<JSObject*> obj_, JS::Handle<js return LocationSetter<nsIDOMWindow>(cx, obj, id, strict, vp); } -struct InterfaceShimEntry { - const char *geckoName; - const char *domName; -}; - -// We add shims from Components.interfaces.nsIDOMFoo to window.Foo for each -// interface that has interface constants that sites might be getting off -// of Ci. -const InterfaceShimEntry kInterfaceShimMap[] = -{ { "nsIDOMFileReader", "FileReader" }, - { "nsIXMLHttpRequest", "XMLHttpRequest" }, - { "nsIDOMDOMException", "DOMException" }, - { "nsIDOMNode", "Node" }, - { "nsIDOMUserDataHandler", "UserDataHandler" }, - { "nsIDOMCSSPrimitiveValue", "CSSPrimitiveValue" }, - { "nsIDOMCSSRule", "CSSRule" }, - { "nsIDOMCSSValue", "CSSValue" }, - { "nsIDOMEvent", "Event" }, - { "nsIDOMNSEvent", "Event" }, - { "nsIDOMKeyEvent", "KeyEvent" }, - { "nsIDOMMouseEvent", "MouseEvent" }, - { "nsIDOMMouseScrollEvent", "MouseScrollEvent" }, - { "nsIDOMMutationEvent", "MutationEvent" }, - { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" }, - { "nsIDOMUIEvent", "UIEvent" }, - { "nsIDOMGeoPositionError", "GeoPositionError" }, - { "nsIDOMHTMLMediaElement", "HTMLMediaElement" }, - { "nsIDOMMediaError", "MediaError" }, - { "nsIDOMLoadStatus", "LoadStatus" }, - { "nsIDOMOfflineResourceList", "OfflineResourceList" }, - { "nsIDOMRange", "Range" }, - { "nsIDOMSVGFETurbulenceElement", "SVGFETurbulenceElement" }, - { "nsIDOMSVGFEMorphologyElement", "SVGFEMorphologyElement" }, - { "nsIDOMSVGFEConvolveMatrixElement", "SVGFEConvolveMatrixElement" }, - { "nsIDOMSVGFEDisplacementMapElement", "SVGFEDisplacementMapElement" }, - { "nsIDOMSVGLength", "SVGLength" }, - { "nsIDOMSVGUnitTypes", "SVGUnitTypes" }, - { "nsIDOMNodeFilter", "NodeFilter" }, - { "nsIDOMXPathNamespace", "XPathNamespace" }, - { "nsIDOMXPathResult", "XPathResult" }, - { "nsIDOMXULButtonElement", "XULButtonElement" }, - { "nsIDOMXULCheckboxElement", "XULCheckboxElement" }, - { "nsIDOMXULPopupElement", "XULPopupElement" } }; - -static nsresult -DefineComponentsShim(JSContext *cx, JS::HandleObject global) -{ - // Keep track of how often this happens. - Telemetry::Accumulate(Telemetry::COMPONENTS_SHIM_ACCESSED_BY_CONTENT, true); - - // Create a fake Components object. - JS::Rooted<JSObject*> components(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(components, NS_ERROR_OUT_OF_MEMORY); - bool ok = JS_DefineProperty(cx, global, "Components", JS::ObjectValue(*components), - JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Create a fake interfaces object. - JS::Rooted<JSObject*> interfaces(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(interfaces, NS_ERROR_OUT_OF_MEMORY); - ok = JS_DefineProperty(cx, components, "interfaces", JS::ObjectValue(*interfaces), - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Define a bunch of shims from the Ci.nsIDOMFoo to window.Foo for DOM - // interfaces with constants. - for (uint32_t i = 0; i < ArrayLength(kInterfaceShimMap); ++i) { - - // Grab the names from the table. - const char *geckoName = kInterfaceShimMap[i].geckoName; - const char *domName = kInterfaceShimMap[i].domName; - - // Look up the appopriate interface object on the global. - JS::Rooted<JS::Value> v(cx, JS::UndefinedValue()); - ok = JS_GetProperty(cx, global, domName, v.address()); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - if (!v.isObject()) { - NS_WARNING("Unable to find interface object on global"); - continue; - } - - // Define the shim on the interfaces object. - ok = JS_DefineProperty(cx, interfaces, geckoName, v, - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - } - - return NS_OK; -} - NS_IMETHODIMP nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *obj_, jsid id_, uint32_t flags, @@ -4386,12 +4294,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, return NS_OK; } - MOZ_ASSERT(*_retval == true); // guaranteed by XPC_WN_Helper_NewResolve - if (id == XPCJSRuntime::Get()->GetStringID(XPCJSRuntime::IDX_COMPONENTS)) { - *objp = obj; - return DefineComponentsShim(cx, obj); - } - nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); MOZ_ASSERT(win->IsInnerWindow()); diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index e3e1b63..666d1e2 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -80,8 +80,6 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ file_bug781476.html \ test_bug785096.html \ test_bug789713.html \ - test_bug790732.html \ - file_bug790732.html \ test_bug793969.html \ file_bug795275.html \ file_bug795275.xml \ @@ -101,6 +99,7 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ test_crosscompartment_weakmap.html \ test_asmjs.html \ file_asmjs.js \ + test_tor_bug2874.html \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/mochitest/file_bug790732.html b/js/xpconnect/tests/mochitest/file_bug790732.html deleted file mode 100644 index 5515dfc..0000000 --- a/js/xpconnect/tests/mochitest/file_bug790732.html +++ /dev/null @@ -1,56 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script> -function testShim() { - - // Basic stuff - ok(Components, "Components shim exists!"); - var Ci = Components.interfaces; - ok(Ci, "interfaces shim exists!"); - is(typeof Components.classes, 'undefined', "Shouldn't have a Cc"); - - // Check each interface that we shim. We start by checking specific - // constants for a couple of interfaces, and then once it's pretty clear that - // it's working as intended we just check that the objects themselves are the - // same. - is(Ci.nsIDOMFileReader.DONE, FileReader.DONE); - is(Ci.nsIXMLHttpRequest.HEADERS_RECEIVED, XMLHttpRequest.HEADERS_RECEIVED); - is(Ci.nsIDOMDOMException.DATA_CLONE_ERR, DOMException.DATA_CLONE_ERR); - is(Ci.nsIDOMNode.DOCUMENT_NODE, Node.DOCUMENT_NODE); - is(Ci.nsIDOMUserDataHandler.NODE_CLONED, UserDataHandler.NODE_CLONED); - is(Ci.nsIDOMCSSPrimitiveValue.CSS_PX, CSSPrimitiveValue.CSS_PX); - is(Ci.nsIDOMCSSRule.NAMESPACE_RULE, CSSRule.NAMESPACE_RULE); - is(Ci.nsIDOMCSSValue.CSS_PRIMITIVE_VALUE, CSSValue.CSS_PRIMITIVE_VALUE); - is(Ci.nsIDOMEvent.FOCUS, Event.FOCUS); - is(Ci.nsIDOMNSEvent.CLICK, Event.CLICK); - is(Ci.nsIDOMKeyEvent, KeyEvent); - is(Ci.nsIDOMMouseEvent, MouseEvent); - is(Ci.nsIDOMMouseScrollEvent, MouseScrollEvent); - is(Ci.nsIDOMMutationEvent, MutationEvent); - is(Ci.nsIDOMSimpleGestureEvent, SimpleGestureEvent); - is(Ci.nsIDOMUIEvent, UIEvent); - is(Ci.nsIDOMGeoPositionError, GeoPositionError); - is(Ci.nsIDOMHTMLMediaElement, HTMLMediaElement); - is(Ci.nsIDOMMediaError, MediaError); - is(Ci.nsIDOMLoadStatus, LoadStatus); - is(Ci.nsIDOMOfflineResourceList, OfflineResourceList); - is(Ci.nsIDOMRange, Range); - is(Ci.nsIDOMSVGFETurbulenceElement, SVGFETurbulenceElement); - is(Ci.nsIDOMSVGFEMorphologyElement, SVGFEMorphologyElement); - is(Ci.nsIDOMSVGFEConvolveMatrixElement, SVGFEConvolveMatrixElement); - is(Ci.nsIDOMSVGFEDisplacementMapElement, SVGFEDisplacementMapElement); - is(Ci.nsIDOMSVGLength, SVGLength); - is(Ci.nsIDOMSVGUnitTypes, SVGUnitTypes); - is(Ci.nsIDOMNodeFilter, NodeFilter); - is(Ci.nsIDOMXPathNamespace, XPathNamespace); - is(Ci.nsIDOMXPathResult, XPathResult); - is(Ci.nsIDOMXULButtonElement, XULButtonElement); - is(Ci.nsIDOMXULCheckboxElement, XULCheckboxElement); - is(Ci.nsIDOMXULPopupElement, XULPopupElement); -} -</script> -</head> -<body> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_bug790732.html b/js/xpconnect/tests/mochitest/test_bug790732.html deleted file mode 100644 index 771950e..0000000 --- a/js/xpconnect/tests/mochitest/test_bug790732.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE HTML> -<html> - -<head> - <meta charset="utf-8"> - <title>Test for Bug 790732</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> - - /** Test for the Components shim. We split into two files because this stuff - is currently pref-controlled. **/ - SimpleTest.waitForExplicitFinish(); - - function prepare() { - SpecialPowers.pushPrefEnv({set: [['dom.omit_components_in_content', true]]}, - function () { $('ifr').onload = go; - $('ifr').contentWindow.location = - '/tests/js/xpconnect/tests/mochitest/file_bug790732.html'; } - ); - } - - function go() { - ok(true, "Started test"); - var iwin = $('ifr').contentWindow; - iwin.ok = ok; - iwin.is = is; - iwin.testShim(); - SimpleTest.finish(); - } - - </script> -</head> -<body onload="prepare()"> -<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=790732">Mozilla Bug 790732</a> -<p id="display"></p> -<div id="content" style="display: none"> - -</div> -<pre id="test"> -</pre> -<iframe id="ifr"></iframe> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_tor_bug2874.html b/js/xpconnect/tests/mochitest/test_tor_bug2874.html new file mode 100644 index 0000000..c0a956e --- /dev/null +++ b/js/xpconnect/tests/mochitest/test_tor_bug2874.html @@ -0,0 +1,25 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Tor Bug 2874</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + is(typeof Components, 'undefined', "The global window object should not expose a Components property to untrusted content."); + </script> +</head> +<body> +<a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2874">Tor Bug 2874</a> +<p id="display"></p> +<div id="content" style="display: none"> + +</div> +<pre id="test"> +</pre> +</body> +</html> diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 9698fac..5594e01 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -2955,10 +2955,6 @@ "kind": "flag", "description": "Whether content ever accesed Components.interfaces in this session" }, - "COMPONENTS_SHIM_ACCESSED_BY_CONTENT": { - "kind": "flag", - "description": "Whether content ever accesed the Components shim in this session" - }, "CHECK_ADDONS_MODIFIED_MS": { "kind": "exponential", "high": "5000",

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 3ef809fcfc22b0d46a52a3393cc685f44b66180e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:34:23 2014 -0700 fixup! Bug #6253: Add canvas image extraction prompt. Use JSContext to get URL information for HTML5 canvas access. --- content/canvas/src/CanvasRenderingContext2D.cpp | 2 +- content/canvas/src/CanvasUtils.cpp | 18 +++++++++++++----- content/canvas/src/CanvasUtils.h | 2 +- content/html/content/src/HTMLCanvasElement.cpp | 9 +++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 9be4ced..c53ac07 100644 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3506,7 +3506,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx, if (mCanvasElement) { nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); usePlaceholder = !ownerDoc || - !CanvasUtils::IsImageExtractionAllowed(ownerDoc); + !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx); } if (usePlaceholder) { diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index f2f4536..591650a 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -35,6 +35,7 @@ using namespace mozilla::gfx; #include "nsUnicharUtils.h" #include "nsPrintfCString.h" #include "nsIConsoleService.h" +#include "jsdbgapi.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -43,10 +44,9 @@ namespace mozilla { namespace CanvasUtils { // Check site-specific permission and display prompt if appropriate. -bool -IsImageExtractionAllowed(nsIDocument *aDocument) +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) { - if (!aDocument) + if (!aDocument || !aCx) return false; nsPIDOMWindow *win = aDocument->GetWindow(); @@ -87,13 +87,21 @@ IsImageExtractionAllowed(nsIDocument *aDocument) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); + nsCString scriptFile("unknown"); + unsigned scriptLine = 0; + JSScript *script; + if (JS_DescribeScriptedCaller(aCx, &script, &scriptLine)) { + scriptFile = JS_GetScriptFilename(aCx, script); + } + nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from %s ", // L10n - firstPartySpec.get(), docSpec.get()); + " from document %s, script from %s:%u ", // L10n + firstPartySpec.get(), docSpec.get(), + scriptFile.get(), scriptLine); nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h index d7aae4d..1e7f726 100644 --- a/content/canvas/src/CanvasUtils.h +++ b/content/canvas/src/CanvasUtils.h @@ -45,7 +45,7 @@ void DoDrawImageSecurityCheck(dom::HTMLCanvasElement *aCanvasElement, bool forceWriteOnly, bool CORSUsed); -bool IsImageExtractionAllowed(nsIDocument *aDocument); +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx); // Make a double out of |v|, treating undefined values as 0.0 (for // the sake of sparse arrays). Return true iff coercion diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index e229e1c..d6cb88a 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -355,7 +355,7 @@ HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams, // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ToDataURLImpl(aCx, aType, aParams, usePlaceholder, aDataURL); } @@ -590,10 +590,11 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, } bool fallbackToPNG = false; + JSContext* cx = nsContentUtils::GetCurrentJSContext(); // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), cx); nsCOMPtr<nsIInputStream> stream; rv = ExtractData(type, EmptyString(), usePlaceholder, getter_AddRefs(stream), fallbackToPNG); @@ -616,7 +617,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, nsRefPtr<nsDOMMemoryFile> blob = new nsDOMMemoryFile(imgData, imgSize, type); - JSContext* cx = nsContentUtils::GetCurrentJSContext(); if (cx) { JS_updateMallocCounter(cx, imgSize); } @@ -648,7 +648,8 @@ HTMLCanvasElement::MozGetAsFile(const nsAString& aName, // Check site-speciifc permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); return MozGetAsFileImpl(aName, aType, usePlaceholder, aResult); }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b899b56326e9f1a48c40a2d233138612a975eeac Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Aug 17 01:31:03 2014 +0000 fixup! Bug #6253: Add canvas image extraction prompt. Modify Pearl Crescent's #7265 patch to log all HTML5 canvas access attempts. --- content/canvas/src/CanvasUtils.cpp | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index 203dd92..f2f4536 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -33,6 +33,8 @@ using namespace mozilla::gfx; #include "mozIThirdPartyUtil.h" #include "nsContentUtils.h" #include "nsUnicharUtils.h" +#include "nsPrintfCString.h" +#include "nsIConsoleService.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -79,14 +81,40 @@ IsImageExtractionAllowed(nsIDocument *aDocument) isAllowed = (permission == nsIPermissionManager::ALLOW_ACTION); if (!isAllowed && (permission != nsIPermissionManager::DENY_ACTION)) { - // Send notification so that a prompt is displayed. - nsCString spec; - rv = uri->GetSpec(spec); + // Log all attempted canvas access and block access by third parties. + bool isThirdParty = true; + nsIURI *docURI = aDocument->GetDocumentURI(); + rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); + NS_ENSURE_SUCCESS(rv, false); + + nsCString firstPartySpec; + rv = uri->GetSpec(firstPartySpec); + nsCString docSpec; + docURI->GetSpec(docSpec); + nsPrintfCString msg("On %s: blocked access to canvas image data" + " from %s ", // L10n + firstPartySpec.get(), docSpec.get()); + + nsCOMPtr<nsIConsoleService> console + (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); + if (console) + console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); + + // Log every canvas access attempt to stdout if debugging: +#ifdef DEBUG + printf("%s\n", msg.get()); +#endif + // Ensure URI is valid after logging, but before trying to notify the + // user: NS_ENSURE_SUCCESS(rv, false); - nsCOMPtr<nsIObserverService> obs = - mozilla::services::GetObserverService(); - obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, - NS_ConvertUTF8toUTF16(spec).get()); + + if (!isThirdParty) { + // Send notification so that a prompt is displayed. + nsCOMPtr<nsIObserverService> obs = + mozilla::services::GetObserverService(); + obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, + NS_ConvertUTF8toUTF16(firstPartySpec).get()); + } } } }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 1229eaa018c10b6503a2f47c986236eee21b6b98 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 16 19:25:57 2014 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. Log the URI of the source doc/channel that failed. --- content/base/src/ThirdPartyUtil.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 06b2a14..7d70b20 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -461,6 +461,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsIURI **aOutput) { nsresult rv = NS_ERROR_NULL_POINTER; + nsCOMPtr<nsIURI> srcURI; if (!aOutput) return rv; @@ -475,6 +476,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // for sure if (aChannel) { rv = GetOriginatingURI(aChannel, aOutput); + aChannel->GetURI(getter_AddRefs(srcURI)); if (NS_SUCCEEDED(rv) && *aOutput) { // At this point, about: and chrome: URLs have been mapped to file: or // jar: URLs. Try to recover the original URL. @@ -501,6 +503,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsCOMPtr<nsIDOMWindow> top; nsCOMPtr<nsIDOMDocument> topDDoc; nsIURI *docURI = nullptr; + srcURI = aDoc->GetDocumentURI(); if (aDoc->GetWindow()) { aDoc->GetWindow()->GetTop(getter_AddRefs(top)); @@ -539,14 +542,19 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console) { nsCString spec; + nsCString srcSpec("unknown"); + + if (srcURI) + srcURI->GetSpec(srcSpec); + if (*aOutput) (*aOutput)->GetSpec(spec); if (spec.Length() > 0) { - nsPrintfCString msg("getFirstPartyURI: no host in first party URI %s", - spec.get()); // TODO: L10N + nsPrintfCString msg("getFirstPartyURI failed for %s: no host in first party URI %s", + srcSpec.get(), spec.get()); // TODO: L10N console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } else { - nsPrintfCString msg("getFirstPartyURI failed: 0x%x", rv); + nsPrintfCString msg("getFirstPartyURI failed for %s: 0x%x", srcSpec.get(), rv); console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 00ad0bffa709d34e393a3b271d768d4e8a466864 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:04:57 2014 +0000 fixup! Bug #6253: Add canvas image extraction prompt. Bug #12684: Make "Not now" default for HTML5 canvas permission dialogue. This alters the `PopupNotification`s [0] which notify users that a website has attempted to access an HTML5 canvas. The new default ordering for buttons is: Not Now Never for this site (recommended) Allow in the future * FIXES #12684 [1] by making "Not Now" the default in the HTML5 canvas fingerprinting permissions dialogue. * ADDS palette icons for HTML5 canvas permissions PopupNotification UI. The image is freely licensed and obtainable from: https://openclipart.org/image/300px/svg_to_png/21620/ben_palette.png * ADDS a CSS whitespace hack from Pearl Crescent to the `CanvasPermissionPromptHelper_init()` function in `browser/base/content/browser.js` for causing the newlines in the `canvas.siteprompt` string (in torbutton.git, in `chrome/locale/en/torbutton.properties`) to render correctly in PopupNotification XUL <description> elements. [2] NOTE: Applying this patch requires an additional patch to TorButton, to store the additional UI strings before localisation. [3] [0]: https://mxr.mozilla.org/mozilla-esr24/source/toolkit/modules/PopupNotificat… [1]: https://bugs.torproject.org/12684 [2]: https://trac.torproject.org/projects/tor/ticket/12684#comment:21 [3]: https://github.com/isislovecruft/torbutton/commit/368e74d62df349b27cf578525… --- browser/base/content/browser.js | 19 ++++++++++++++++--- browser/themes/linux/browser.css | 10 ++++++++-- browser/themes/linux/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/linux/jar.mn | 1 + browser/themes/osx/browser.css | 10 ++++++++-- browser/themes/osx/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/osx/jar.mn | 1 + browser/themes/windows/browser.css | 10 ++++++++-- browser/themes/windows/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/windows/jar.mn | 1 + 10 files changed, 100 insertions(+), 9 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 1df295a..b4da3f6 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6034,6 +6034,12 @@ var CanvasPermissionPromptHelper = { init: function CanvasPermissionPromptHelper_init() { + if (document.styleSheets && (document.styleSheets.length > 0)) try { + let ruleText = "panel[popupid=canvas-permissions-prompt] description { white-space: pre-wrap; }"; + let sheet = document.styleSheets[0]; + sheet.insertRule(ruleText, sheet.cssRules.length); + } catch (e) {}; + Services.obs.addObserver(this, this._permissionsPrompt, false); }, @@ -6077,10 +6083,10 @@ var CanvasPermissionPromptHelper = { var message = getLocalizedString("canvas.siteprompt", [ uri.asciiHost ]); var mainAction = { - label: getLocalizedString("canvas.allow"), - accessKey: getLocalizedString("canvas.allowAccessKey"), + label: getLocalizedString("canvas.notNow"), + accessKey: getLocalizedString("canvas.notNowAccessKey"), callback: function() { - setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + return null; } }; @@ -6091,6 +6097,13 @@ var CanvasPermissionPromptHelper = { callback: function() { setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION); } + }, + { + label: getLocalizedString("canvas.allow"), + accessKey: getLocalizedString("canvas.allowAccessKey"), + callback: function() { + setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + } } ]; diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 9395669..a47ea4e 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1207,7 +1207,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url("moz-icon://stock/gtk-cancel?size=menu"); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -1291,7 +1294,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/linux/canvas-popup.svg b/browser/themes/linux/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/linux/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index b4eaf14..4d1892d 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -231,6 +231,7 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress.css #endif + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 4166ed0..085a1da 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3103,7 +3103,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-margin-start: 0; /* override default label margin to match description margin */ } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); @@ -3375,7 +3378,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-image-region: rect(0px, 48px, 16px, 32px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], diff --git a/browser/themes/osx/canvas-popup.svg b/browser/themes/osx/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/osx/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 8295008..de119b1 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -329,6 +329,7 @@ browser.jar: skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon(a)2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion(a)2x.png) skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png) skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png) + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-16(a)2x.png skin/classic/browser/webapps-64.png diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index edb064c..7012c41 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2449,7 +2449,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { -moz-image-region: rect(32px, 32px, 48px, 16px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -2531,7 +2534,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/windows/canvas-popup.svg b/browser/themes/windows/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/windows/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index eff2220..b9cf33a 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -69,6 +69,7 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)

1 0

[torbutton/master] Bug 12684: Slightly tweak the canvas message.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 402eb5d24ba35aef68ecbe95d77fa3c5c0768d29 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:52:21 2014 -0700 Bug 12684: Slightly tweak the canvas message. Still not perfect, but repeating "image data" and "extract" twice might help get the point across. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c04b1e8..c76be32 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,7 +48,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now canvas.notNowAccessKey=N canvas.allow=Allow in the future

1 0

[torbutton/master] Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed'
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit d09b8425899cf838e0f0b86fffee248cf2be63b5 Merge: b6e98c0 b0d3f18 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:46:15 2014 -0700 Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed' src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[torbutton/master] Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b0d3f1879bf6b3bb61499c8178155729457856a5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:18:10 2014 +0000 Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file. Also, clarify UI strings which explain HTML5 canvas fingerprinting and options within the PopupNotification dialogue, and make capitalisation consistent. * FIXES #12684. [0] [0]: https://bugs.torproject.org/12684 --- src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d34432d..c04b1e8 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.notNow=Not Now +canvas.notNowAccessKey=N +canvas.allow=Allow in the future canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Never for this site (recommended) canvas.neverAccessKey=e

1 0

[tor-launcher/master] Do not show copy log button when help is open.
by brade＠torproject.org 19 Aug '14

19 Aug '14

commit fb7e0576942310ff262165ecf6cf7c2bf2ed48bd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 19 11:10:07 2014 -0400 Do not show copy log button when help is open. If a Tor error or warning message arrived while the Bridge Help was open, the "Copy Tor Log To Clipboard" button was shown immediately (instead of after the help was closed). --- src/chrome/content/network-settings.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e84f92..5f3f698 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -439,10 +439,7 @@ function showPanel(aPanelID) var deckElem = document.getElementById("deck"); if (deckElem) - { deckElem.selectedPanel = document.getElementById(aPanelID); - showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); - } else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); @@ -527,17 +524,19 @@ function showErrorMessage(aTorExited, aErrorMsg) function showCopyLogButton(aHaveErrorOrWarning) { - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { - if (getWizard()) + let haveWizard = (getWizard() != null); + if (haveWizard) copyLogBtn.setAttribute("wizardCanCopyLog", true); - copyLogBtn.removeAttribute("hidden"); + if (!gRestoreAfterHelpPanelID) + copyLogBtn.removeAttribute("hidden"); // Show button if help is not open. if (aHaveErrorOrWarning) { - var clz = copyLogBtn.getAttribute("class"); + let clz = copyLogBtn.getAttribute("class"); if (!clz) copyLogBtn.setAttribute("class", "torWarning"); else if (clz.indexOf("torWarning") < 0) @@ -549,14 +548,12 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - if (!getWizard()) - return; - - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (!copyLogBtn) return; - if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + // Always show button in non-wizard case; conditionally in wizard. + if (!getWizard() || copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); else copyLogBtn.setAttribute("hidden", true); @@ -735,11 +732,12 @@ function onOpenHelp() showPanel("bridgeHelp"); + showOrHideButton("extra2", false, false); // Hide "Copy Tor Log To Clipboard" + if (getWizard()) { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -755,11 +753,12 @@ function closeHelp() if (!gRestoreAfterHelpPanelID) // Already closed? return; + restoreCopyLogVisibility(); + if (getWizard()) { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[tor-launcher/master] Bug 11199 fixup: Improve behavior if tor exits.
by brade＠torproject.org 14 Aug '14

14 Aug '14

commit 3aa4860244adf99ba09911708ba8faa05a6cfa14 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 14 16:37:53 2014 -0400 Bug 11199 fixup: Improve behavior if tor exits. Improved alert/error messages and button labels. --- src/chrome/content/network-settings-wizard.xul | 2 +- src/chrome/content/network-settings.js | 7 ++++++- src/chrome/content/network-settings.xul | 2 +- src/chrome/locale/en/torlauncher.properties | 6 +++--- src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 18 ++++++++++++++---- src/modules/tl-util.jsm | 8 +++++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6a3b8fc..70d1bcf 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -168,7 +168,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index fdd565e..0e84f92 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -491,15 +491,20 @@ function showErrorMessage(aTorExited, aErrorMsg) if (aTorExited) { // Show "Tor exited" message and "Restart Tor" button. - aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited"); + aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited") + + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); if (btn) btn.removeAttribute("hidden"); + if (elem) + elem.style.textAlign = "start"; } else { if (btn) btn.setAttribute("hidden", true); + if (elem) + elem.style.textAlign = "center"; } if (elem) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 937db71..a81a5f0 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -67,7 +67,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index bf2426a..816d831 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect -torlauncher.reconnect=Reconnect +torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index a823914..03f84d7 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -105,6 +105,7 @@ wizardpage[pageid="errorPanel"] description, font-size: 120%; font-weight: bold; white-space: pre-wrap; + text-align: center; } #restartButton { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 619a32c..cc5d654 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -148,11 +148,21 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited"); + var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + + TorLauncherUtil.getLocalizedString("tor_exited2"); TorLauncherLogger.log(4, s); - s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost"); - var btnLabel = TorLauncherUtil.getLocalizedString("reconnect"); - if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting) + var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); + var cancelBtnLabel = "OK"; + try + { + const kSysBundleURI = "chrome://global/locale/commonDialogs.properties"; + var sysBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService).createBundle(kSysBundleURI); + cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel); + } catch(e) {} + + if (TorLauncherUtil.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel) + && !this.mIsQuitting) { this._startTor(); this._controlTor(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 1b8c809..834d260 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -64,7 +64,8 @@ let TorLauncherUtil = // Public // Returns true if user confirms; false if not. // Note that no prompt is shown (and false is returned) if the Network Settings // window is open. - showConfirm: function(aParentWindow, aMsg, aOKButtonLabel) + showConfirm: function(aParentWindow, aMsg, aDefaultButtonLabel, + aCancelButtonLabel) { try { @@ -84,11 +85,12 @@ let TorLauncherUtil = // Public var title = this.getLocalizedString("error_title"); var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) + ps.BUTTON_POS_0_DEFAULT - + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL); + + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING); var notUsed = { value: false }; var btnIndex = ps.confirmEx(aParentWindow, title, aMsg, btnFlags, - aOKButtonLabel, null, null, null, notUsed); + aDefaultButtonLabel, aCancelButtonLabel, + null, null, notUsed); return (0 == btnIndex); } catch (e)

1 0

[tor-launcher/master] Remove all observers when dialogs are closed.
by brade＠torproject.org 07 Aug '14

07 Aug '14

commit 9c0ef4f67d5ec18e17e8a3e789a198819c90c7ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 7 14:14:57 2014 -0400 Remove all observers when dialogs are closed. --- src/chrome/content/network-settings-wizard.xul | 3 +- src/chrome/content/network-settings.js | 64 +++++++++++++++++++----- src/chrome/content/network-settings.xul | 3 +- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index da81ced..6a3b8fc 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -21,7 +21,8 @@ buttonlabelextra2="&torsettings.copyLog;" onwizardfinish="return applySettings();" onwizardcancel="return onCancel();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index bdfb5c1..fdd565e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -62,6 +62,7 @@ var gObsService = null; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; var gRestoreAfterHelpPanelID = null; +var gActiveTopics = []; // Topics for which an observer is currently installed. function initDialog() @@ -156,10 +157,10 @@ function initDialog() initDefaultBridgeTypeMenu(); - gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); - gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); - gObsService.addObserver(gObserver, kTorOpenProgressTopic, false); + addObserver(kTorBootstrapErrorTopic); + addObserver(kTorLogHasWarnOrErrTopic); + addObserver(kTorProcessExitedTopic); + addObserver(kTorOpenProgressTopic); var status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && @@ -169,8 +170,8 @@ function initDialog() showErrorMessage(true, null); else showStartingTorPanel(); - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); } else { @@ -199,6 +200,12 @@ function initDialog() } +function deinitDialog() +{ + removeAllObservers(); +} + + // For now, we assume that the wizard buttons are the widest portion. // TODO: return a value for the settings dialog (non-wizard case). function maxWidthOfContent() @@ -329,7 +336,8 @@ var gObserver = { if (kTorProcessReadyTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessReadyTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); var haveWizard = (getWizard() != null); showPanel(); if (haveWizard) @@ -341,12 +349,13 @@ var gObserver = { } else if (kTorProcessDidNotStartTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); showErrorMessage(false, aData); } else if (kTorProcessExitedTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessExitedTopic); + removeObserver(kTorProcessExitedTopic); showErrorMessage(true, null); } else if (kTorOpenProgressTopic == aTopic) @@ -357,6 +366,37 @@ var gObserver = { }; +// addObserver() will not add two observers for the same topic. +function addObserver(aTopic) +{ + if (gActiveTopics.indexOf(aTopic) < 0) + { + gObsService.addObserver(gObserver, aTopic, false); + gActiveTopics.push(aTopic); + } +} + + +function removeObserver(aTopic) +{ + let idx = gActiveTopics.indexOf(aTopic); + if (idx >= 0) + { + gObsService.removeObserver(gObserver, aTopic); + gActiveTopics.splice(idx, 1); + } +} + + +function removeAllObservers() +{ + for (let i = gActiveTopics.length - 1; i >= 0; --i) + gObsService.removeObserver(gObserver, gActiveTopics[i]); + + gActiveTopics = []; +} + + function readTorSettings() { TorLauncherLogger.log(2, "readTorSettings " + @@ -641,9 +681,9 @@ function onProxyTypeChange() function onRestartTor() { // Re-add these observers in case they have been removed. - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); + addObserver(kTorProcessExitedTopic); gTorProcessService._startTor(); gTorProcessService._controlTor(); diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 1fcd4a7..937db71 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -24,7 +24,8 @@ ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/>

1 0

[tor-browser-bundle/maint-3.6] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit cc6a688a1e8b5c1501ecb5f9838683e833153747 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:34:28 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 24bc2eea8666da86c524b321c9889e9b96f6be7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:33:23 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update main Changelog with newer 3.6.4 material.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 4426a4daed68c08d4582b8b713b0dd3bdf397b82 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:06:37 2014 -0700 Update main Changelog with newer 3.6.4 material. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9626ceb..8eb4284 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 +Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) * Two modes of Meek are provided: Meek over Google and Meek over Amazon @@ -31,10 +31,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1

1 0

[tor-browser-bundle/maint-3.6] Apply rebased Bug11200-hang fix.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 91751b52e06a3fe5dd94eb4fa045ac75859d5842 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:04:17 2014 -0700 Apply rebased Bug11200-hang fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug11200-hang-0.2.4.patch | 66 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e986467..d0336d7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,8 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 27e242b..fa1badb 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -80,6 +81,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 054e1a8..5e1ea0f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug11200-hang-0.2.4.patch" - "bug8402-master.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -76,6 +77,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aea69b9..7d244ae 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "binutils.tar.bz2" - "dzip.sh" - "binutils-win32-utils.zip" @@ -77,6 +78,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/patches/bug11200-hang-0.2.4.patch b/gitian/patches/bug11200-hang-0.2.4.patch new file mode 100644 index 0000000..6bac5e4 --- /dev/null +++ b/gitian/patches/bug11200-hang-0.2.4.patch @@ -0,0 +1,66 @@ +From 813dc75f717cab1f7896c77e838c496daa3e4deb Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 15:57:24 -0700 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 + +When Tor starts with DisabledNetwork set, it would correctly +conclude that it shouldn't try making circuits, but it would +mistakenly cache this conclusion and continue believing it even +when DisableNetwork is set to 0. Fixes the bug introduced by the +fix for bug 11200; bugfix on 0.2.5.4-alpha. +--- + src/or/nodelist.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index e814e16..18b6677 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1240,10 +1240,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; + } ++ + return have_min_dir_info; + } + +@@ -1439,7 +1450,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; +- const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1452,13 +1462,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- goto done; +- } +- + using_md = consensus->flavor == FLAV_MICRODESC; + + { +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Replace bug11200 patch with squashed version.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit d624e24bd780a11c289168d88f703b885f25ff6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:51:07 2014 -0700 Replace bug11200 patch with squashed version. --- gitian/patches/bug11200-hang-0.2.5.patch | 197 ++++-------------------------- 1 file changed, 21 insertions(+), 176 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index a95afb2..76cd159 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,61 +1,7 @@ -From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 +From fcac4b4467427e8f6ad948e8c8e6f34a0131e716 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/4] move the consensus check below the disablednetwork check - -should have no impact in practice ---- - src/or/nodelist.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 8f87081..a33a8b2 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1495,11 +1495,20 @@ update_router_have_minimum_dir_info(void) - time_t now = time(NULL); - int res; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus = -- networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - -+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -+ res = 0; -+ goto done; -+ } -+ -+ consensus = -+ networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ - if (!consensus) { - if (!networkstatus_get_latest_consensus()) - strlcpy(dir_info_status, "We have no usable consensus.", -@@ -1511,13 +1520,6 @@ update_router_have_minimum_dir_info(void) - goto done; - } - -- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -- res = 0; -- goto done; -- } -- - using_md = consensus->flavor == FLAV_MICRODESC; - - { --- -1.9.1 - -From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -64,8 +10,8 @@ when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. --- changes/bug11200-caching | 7 +++++++ - src/or/nodelist.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) + src/or/nodelist.c | 21 ++++++++++++--------- + 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 changes/bug11200-caching diff --git a/changes/bug11200-caching b/changes/bug11200-caching @@ -82,97 +28,10 @@ index 0000000..e3fbaec + fix for bug 11200; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index a33a8b2..c863663 100644 +index 8f87081..7b1f338 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c -@@ -1494,16 +1494,21 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -+ static int disabled=0; - const or_options_t *options = get_options(); - const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ if (!disabled) -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -+ disabled = 1; - goto done; -+ } else { -+ disabled = 0; - } - - consensus = -@@ -1568,6 +1573,7 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- need_to_update_have_min_dir_info = 0; -+ if (!disabled) -+ need_to_update_have_min_dir_info = 0; - } - --- -1.9.1 - -From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/4] Stop redundant clearing of - need_to_update_have_min_dir_info - -We were clearing it in router_have_minimum_dir_info() as well as in -update_router_have_minimum_dir_info(). ---- - src/or/nodelist.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index c863663..6eb286f 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1277,7 +1277,6 @@ router_have_minimum_dir_info(void) - { - if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { - update_router_have_minimum_dir_info(); -- need_to_update_have_min_dir_info = 0; - } - return have_min_dir_info; - } -@@ -1488,7 +1487,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, - - /** Change the value of have_min_dir_info, setting it true iff we have enough - * network and router information to build circuits. Clear the value of -- * need_to_update_have_min_dir_info. */ -+ * need_to_update_have_min_dir_info if we're confident of our answer. */ - static void - update_router_have_minimum_dir_info(void) - { --- -1.9.1 - -From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Wed, 6 Aug 2014 02:11:52 -0400 -Subject: [PATCH 4/4] refactor DisableNetwork check - -Move the block from update_router_have_minimum_dir_info() to -router_have_minimum_dir_info() so it's clearer that it's not -actually updating the variable. ---- - src/or/nodelist.c | 34 +++++++++++++++------------------- - 1 file changed, 15 insertions(+), 19 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 6eb286f..57b0bce 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; +@@ -1275,10 +1275,21 @@ static char dir_info_status[256] = ""; int router_have_minimum_dir_info(void) { @@ -189,48 +48,34 @@ index 6eb286f..57b0bce 100644 + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; } + return have_min_dir_info; } -@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -- static int disabled=0; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus; -- int using_md; +@@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; - const char *delay_fetches_msg = NULL; -- + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- if (!disabled) -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -- disabled = 1; - goto done; -- } else { -- disabled = 0; - } - -- consensus = -+ const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ int using_md; - - if (!consensus) { - if (!networkstatus_get_latest_consensus()) -@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- if (!disabled) -- need_to_update_have_min_dir_info = 0; -+ need_to_update_have_min_dir_info = 0; - } + using_md = consensus->flavor == FLAV_MICRODESC; + { -- 1.9.1

1 0

[tor-browser-bundle/master] Update 11200 patch to include Roger's refactoring.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 3385f5755dc8e10f1829b35ddfb6619a9b5ced7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:29:13 2014 -0700 Update 11200 patch to include Roger's refactoring. --- gitian/patches/bug11200-hang-0.2.5.patch | 84 ++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index 00664a4..a95afb2 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,7 +1,7 @@ From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/3] move the consensus check below the disablednetwork check +Subject: [PATCH 1/4] move the consensus check below the disablednetwork check should have no impact in practice --- @@ -55,7 +55,7 @@ index 8f87081..a33a8b2 100644 From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/3] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -123,7 +123,7 @@ index a33a8b2..c863663 100644 From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/3] Stop redundant clearing of +Subject: [PATCH 3/4] Stop redundant clearing of need_to_update_have_min_dir_info We were clearing it in router_have_minimum_dir_info() as well as in @@ -156,3 +156,81 @@ index c863663..6eb286f 100644 -- 1.9.1 +From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 02:11:52 -0400 +Subject: [PATCH 4/4] refactor DisableNetwork check + +Move the block from update_router_have_minimum_dir_info() to +router_have_minimum_dir_info() so it's clearer that it's not +actually updating the variable. +--- + src/or/nodelist.c | 34 +++++++++++++++------------------- + 1 file changed, 15 insertions(+), 19 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 6eb286f..57b0bce 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); + } ++ + return have_min_dir_info; + } + +@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) + { + time_t now = time(NULL); + int res; +- static int disabled=0; + const or_options_t *options = get_options(); +- const networkstatus_t *consensus; +- int using_md; +- const char *delay_fetches_msg = NULL; +- +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- if (!disabled) +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- disabled = 1; +- goto done; +- } else { +- disabled = 0; +- } +- +- consensus = ++ const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); ++ int using_md; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) + control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); + } + have_min_dir_info = res; +- if (!disabled) +- need_to_update_have_min_dir_info = 0; ++ need_to_update_have_min_dir_info = 0; + } + +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Update OpenSSL to 1.0.1i.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit c3f95315259334409b916c511ea43f4abf127b41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:32:25 2014 -0700 Update OpenSSL to 1.0.1i. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f1f647d..9626ceb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Two modes of Meek are provided: Meek over Google and Meek over Amazon * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.6-alpha + * Update OpenSSL to 1.0.1i * Update NoScript to 2.6.8.36 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 5.0development.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d889402..52d0b9b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.24 @@ -72,7 +72,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-3.6] Update OpenSSL to 1.0.1i.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit e5d2beddeab6cb4cb0c8c0e8c7ae67659f493159 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:34:00 2014 -0700 Update OpenSSL to 1.0.1i. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 88bb0d6..e986467 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,8 @@ -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message * Update NoScript to 2.6.8.36 diff --git a/gitian/versions b/gitian/versions index b62e547..e700ad3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 @@ -69,7 +69,7 @@ LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-3.6] Properly apply patch 11654.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit b1aac2b64d108dd0d8e3b0ce90b5275d06bf76b4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:24:50 2014 -0700 Properly apply patch 11654. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/patches/bug11156.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 38eef4b..88bb0d6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,8 @@ Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch index d9f8e7a..68fcde9 100644 --- a/gitian/patches/bug11156.patch +++ b/gitian/patches/bug11156.patch @@ -273,3 +273,30 @@ index 0000000..97c70b2 -- 1.9.1 +From 6a584ab03670b40031704f2c32bd8f41cb74d694 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Thu, 1 May 2014 14:44:29 +0100 +Subject: [PATCH 1/2] Fix a misuse of strlcpy() introduced by the #11156 patch. + +--- + src/or/nodelist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index a38a6d4..09232f9 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void) + } + + if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, "%s", sizeof(dir_info_status)); ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); + res = 0; + goto done; + } +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Fix wrong NoScript and HTTPS-Everywhere hashes.
by gk＠torproject.org 06 Aug '14

06 Aug '14

commit 72295c8c0a82ca27977ba57fc33afa66dc5ad1dc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 6 19:09:46 2014 +0000 Fix wrong NoScript and HTTPS-Everywhere hashes. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 272ee28..0462eae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -77,8 +77,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 +NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Apply a new patch to address a hang caused by bug11200's fix.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 46ea6f3cfb196856d07b99697381d38fc75b1cbd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 5 15:03:33 2014 -0700 Apply a new patch to address a hang caused by bug11200's fix. --- Bundle-Data/Docs/ChangeLog.txt | 3 + gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug11200-hang-0.2.5.patch | 158 +++++++++++++++++++++++++++++ 5 files changed, 167 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 854b00d..f1f647d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,9 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 9516: Send Tor Launcher log messages to Browser Console * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation + * Backported Tor Patches: + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Linux: * Bug 10178: Make it easier to set an alternate Tor control port and password * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 27e242b..c741cf2 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.5.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -82,6 +83,7 @@ script: | git am ~/build/bug8402.patch else git am ~/build/bug8402-master.patch + git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 778149b..e708ef8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.5.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -79,6 +80,7 @@ script: | git am ~/build/bug8402.patch else git am ~/build/bug8402-master.patch + git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aea69b9..f1b9d7d 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.5.patch" - "binutils.tar.bz2" - "dzip.sh" - "binutils-win32-utils.zip" @@ -79,6 +80,7 @@ script: | git am ~/build/bug8402.patch else git am ~/build/bug8402-master.patch + git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch new file mode 100644 index 0000000..00664a4 --- /dev/null +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -0,0 +1,158 @@ +From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Tue, 5 Aug 2014 16:54:46 -0400 +Subject: [PATCH 1/3] move the consensus check below the disablednetwork check + +should have no impact in practice +--- + src/or/nodelist.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 8f87081..a33a8b2 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1495,11 +1495,20 @@ update_router_have_minimum_dir_info(void) + time_t now = time(NULL); + int res; + const or_options_t *options = get_options(); +- const networkstatus_t *consensus = +- networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); ++ const networkstatus_t *consensus; + int using_md; + const char *delay_fetches_msg = NULL; + ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ res = 0; ++ goto done; ++ } ++ ++ consensus = ++ networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); ++ + if (!consensus) { + if (!networkstatus_get_latest_consensus()) + strlcpy(dir_info_status, "We have no usable consensus.", +@@ -1511,13 +1520,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- goto done; +- } +- + using_md = consensus->flavor == FLAV_MICRODESC; + + { +-- +1.9.1 + +From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Tue, 5 Aug 2014 17:04:39 -0400 +Subject: [PATCH 2/3] Build circuits more readily when DisableNetwork goes to 0 + +When Tor starts with DisabledNetwork set, it would correctly +conclude that it shouldn't try making circuits, but it would +mistakenly cache this conclusion and continue believing it even +when DisableNetwork is set to 0. Fixes the bug introduced by the +fix for bug 11200; bugfix on 0.2.5.4-alpha. +--- + changes/bug11200-caching | 7 +++++++ + src/or/nodelist.c | 10 ++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + create mode 100644 changes/bug11200-caching + +diff --git a/changes/bug11200-caching b/changes/bug11200-caching +new file mode 100644 +index 0000000..e3fbaec +--- /dev/null ++++ b/changes/bug11200-caching +@@ -0,0 +1,7 @@ ++ o Major bugfixes: ++ - When Tor starts with DisabledNetwork set, it would correctly ++ conclude that it shouldn't try making circuits, but it would ++ mistakenly cache this conclusion and continue believing it even ++ when DisableNetwork is set to 0. Fixes the bug introduced by the ++ fix for bug 11200; bugfix on 0.2.5.4-alpha. ++ +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index a33a8b2..c863663 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1494,16 +1494,21 @@ update_router_have_minimum_dir_info(void) + { + time_t now = time(NULL); + int res; ++ static int disabled=0; + const or_options_t *options = get_options(); + const networkstatus_t *consensus; + int using_md; + const char *delay_fetches_msg = NULL; + + if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ if (!disabled) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); + strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); + res = 0; ++ disabled = 1; + goto done; ++ } else { ++ disabled = 0; + } + + consensus = +@@ -1568,6 +1573,7 @@ update_router_have_minimum_dir_info(void) + control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); + } + have_min_dir_info = res; +- need_to_update_have_min_dir_info = 0; ++ if (!disabled) ++ need_to_update_have_min_dir_info = 0; + } + +-- +1.9.1 + +From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Tue, 5 Aug 2014 17:33:33 -0400 +Subject: [PATCH 3/3] Stop redundant clearing of + need_to_update_have_min_dir_info + +We were clearing it in router_have_minimum_dir_info() as well as in +update_router_have_minimum_dir_info(). +--- + src/or/nodelist.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index c863663..6eb286f 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1277,7 +1277,6 @@ router_have_minimum_dir_info(void) + { + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; + } + return have_min_dir_info; + } +@@ -1488,7 +1487,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, + + /** Change the value of have_min_dir_info, setting it true iff we have enough + * network and router information to build circuits. Clear the value of +- * need_to_update_have_min_dir_info. */ ++ * need_to_update_have_min_dir_info if we're confident of our answer. */ + static void + update_router_have_minimum_dir_info(void) + { +-- +1.9.1 +

1 0

[tor-browser-bundle/maint-3.6] Fix NoScript's package name.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit 227e6eab50d3fa5c61191841731ac95907b6bcd3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 08:05:41 2014 +0000 Fix NoScript's package name. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index b29948c..b62e547 100755 --- a/gitian/versions +++ b/gitian/versions @@ -46,7 +46,7 @@ HTTPSE_VER=3.5.3 ## 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.6.8.36-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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

1 0

[tor-browser-bundle/master] Fixed NoScript's package name.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit a767ba6b55864ddffe3eb75b64f3eb20612f59b0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 08:04:31 2014 +0000 Fixed NoScript's package name. --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 933fe89..d889402 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.36-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 307b851..272ee28 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.36-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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

1 0

[tor-browser-bundle/master] Changelog update.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit f8f36e38ec419457d38ed4815aed802c327c30ae Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 07:57:03 2014 +0000 Changelog update. --- 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 f7bcb68..854b00d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -31,6 +31,7 @@ Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap

1 0

[tor-browser-bundle/maint-3.6] NoScript version bump; Changelog update.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit b733d34701864bb061e17a106b07e0ba7d8110b0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 07:55:02 2014 +0000 NoScript version bump; Changelog update. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d2468be..38eef4b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap diff --git a/gitian/versions b/gitian/versions index e5e53e4..b29948c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -46,7 +46,7 @@ HTTPSE_VER=3.5.3 ## 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.6.8.33-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -74,7 +74,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 +NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] Update Changelog.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit 2e2f5a9aa9fde522845f8c8463d6e54d43815702 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 07:51:38 2014 +0000 Update Changelog. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eccae14..f7bcb68 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,7 +4,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Two modes of Meek are provided: Meek over Google and Meek over Amazon * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.6-alpha - * Update NoScript to 2.6.8.33 + * Update NoScript to 2.6.8.36 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 5.0development.0 * Update Torbutton to 1.6.12.0

1 0

[tor-browser-bundle/master] NoScript and HTTPS-Everyhwere version bump.
by gk＠torproject.org 05 Aug '14

05 Aug '14

commit 1207f08b35d7aab392c7e5b52e704f22698bb3d3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 5 07:48:09 2014 +0000 NoScript and HTTPS-Everyhwere version bump. --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f7b0446..933fe89 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.33-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 +NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f61f5e8..307b851 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,13 +43,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.3 +HTTPSE_VER=5.0development.0 GO_VER=1.3 ## 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.6.8.33-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.36-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 +HTTPSE_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Update changelog date.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 13110be586b4e87e5dba76344bd90dd8230c18dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:56:20 2014 -0700 Update changelog date. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7b92997..c3f872e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 +Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) * Two modes of Meek are provided: Meek over Google and Meek over Amazon

1 0

[tor-browser-bundle/master] Update Tor Launcher to 0.2.6.2.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 2bddcb7a34689082da9a319121e412c4c94c8210 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 20:01:52 2014 -0700 Update Tor Launcher to 0.2.6.2. Also add 3.6.4 changelog material into main changelog. --- Bundle-Data/Docs/ChangeLog.txt | 12 +++++++++++- gitian/versions.alpha | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c3f872e..eccae14 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -14,11 +14,12 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 12680: Change Torbutton URL in about dialog. * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap * Bug 9531: Workaround to avoid rare hangs during New Identity - * Update Tor Launcher to 0.2.6.1 + * Update Tor Launcher to 0.2.6.2 * Bug 11199: Improve behavior if tor exits * Bug 12451: Add option to hide TBB's logo * Bug 11193: Change "Tor Browser Bundle" to "Tor Browser" * Bug 11471: Ensure text fits the initial configuration dialog + * Bug 9516: Send Tor Launcher log messages to Browser Console * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation * Linux: @@ -26,6 +27,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore +Tor Browser Bundle 3.6.4 -- Aug 6 2014 + * All Platforms + * Update Tor to 0.2.4.23 + * Update Tor launcher to 0.2.5.6 + * Bug 9516: Send Tor Launcher log messages to Browser Console + * Update Torbutton to 1.6.11.1 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. + Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms * Update Firefox to 24.7.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1911175..f7b0446 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.6-alpha -TORLAUNCHER_TAG=0.2.6.1 +TORLAUNCHER_TAG=0.2.6.2 TORBUTTON_TAG=1.6.12.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2

1 0

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit f31c4bb628b93b25fb1790c203496dc123d1801e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:59:35 2014 -0700 Update translations. --- src/chrome/locale/ach/torlauncher.properties | 2 + src/chrome/locale/ady/torlauncher.properties | 2 + src/chrome/locale/af-ZA/torlauncher.properties | 1 + src/chrome/locale/af/torlauncher.properties | 2 + src/chrome/locale/ak/torlauncher.properties | 2 + src/chrome/locale/am-ET/torlauncher.properties | 1 + src/chrome/locale/am/torlauncher.properties | 2 + src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 10 +- src/chrome/locale/arn/torlauncher.properties | 2 + src/chrome/locale/ast/torlauncher.properties | 2 + src/chrome/locale/az/torlauncher.properties | 2 + src/chrome/locale/be/torlauncher.properties | 2 + src/chrome/locale/bg-BG/torlauncher.properties | 1 + src/chrome/locale/bg/torlauncher.properties | 16 +-- src/chrome/locale/bn-BD/torlauncher.properties | 1 + src/chrome/locale/bn-IN/torlauncher.properties | 2 + src/chrome/locale/bn/network-settings.dtd | 6 +- src/chrome/locale/bn/progress.dtd | 8 +- src/chrome/locale/bn/torlauncher.properties | 4 +- src/chrome/locale/bo/torlauncher.properties | 2 + src/chrome/locale/br/torlauncher.properties | 2 + src/chrome/locale/bs/torlauncher.properties | 2 + src/chrome/locale/ca-ES/torlauncher.properties | 1 + src/chrome/locale/ca/torlauncher.properties | 2 + src/chrome/locale/ca(a)valencia/network-settings.dtd | 1 - src/chrome/locale/cs-CZ/torlauncher.properties | 1 + src/chrome/locale/cs/torlauncher.properties | 2 + src/chrome/locale/csb/torlauncher.properties | 2 + src/chrome/locale/cv/network-settings.dtd | 2 +- src/chrome/locale/cv/torlauncher.properties | 2 + src/chrome/locale/cy/torlauncher.properties | 2 + src/chrome/locale/da/torlauncher.properties | 2 + src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 2 + src/chrome/locale/dz/torlauncher.properties | 2 + src/chrome/locale/el-GR/torlauncher.properties | 1 + src/chrome/locale/el/network-settings.dtd | 43 ++++---- src/chrome/locale/el/torlauncher.properties | 2 + src/chrome/locale/en-GB/torlauncher.properties | 2 + src/chrome/locale/eo/torlauncher.properties | 2 + src/chrome/locale/es-AR/torlauncher.properties | 2 + src/chrome/locale/es-CL/torlauncher.properties | 2 + src/chrome/locale/es-CO/torlauncher.properties | 2 + src/chrome/locale/es-MX/network-settings.dtd | 4 +- src/chrome/locale/es-MX/torlauncher.properties | 10 +- src/chrome/locale/es-NI/torlauncher.properties | 1 + src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/es/progress.dtd | 4 +- src/chrome/locale/es/torlauncher.properties | 2 + src/chrome/locale/et/torlauncher.properties | 2 + src/chrome/locale/eu/torlauncher.properties | 2 + src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fa/torlauncher.properties | 12 ++- src/chrome/locale/fi/network-settings.dtd | 50 ++++----- src/chrome/locale/fi/torlauncher.properties | 2 + src/chrome/locale/fil/network-settings.dtd | 2 +- src/chrome/locale/fil/progress.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 106 ++++++++++---------- src/chrome/locale/fo/torlauncher.properties | 2 + src/chrome/locale/fr-CA/network-settings.dtd | 2 +- src/chrome/locale/fr-CA/torlauncher.properties | 2 + src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 2 + src/chrome/locale/fur/torlauncher.properties | 2 + src/chrome/locale/fy/torlauncher.properties | 2 + src/chrome/locale/ga/torlauncher.properties | 2 + src/chrome/locale/gl/torlauncher.properties | 8 +- src/chrome/locale/gu-IN/torlauncher.properties | 2 + src/chrome/locale/gu/torlauncher.properties | 2 + src/chrome/locale/gun/torlauncher.properties | 2 + src/chrome/locale/ha/torlauncher.properties | 2 + src/chrome/locale/he/torlauncher.properties | 2 + src/chrome/locale/hi/network-settings.dtd | 2 +- src/chrome/locale/hi/torlauncher.properties | 2 + src/chrome/locale/hr-HR/network-settings.dtd | 41 ++++---- src/chrome/locale/hr-HR/torlauncher.properties | 4 +- src/chrome/locale/hr/torlauncher.properties | 2 + src/chrome/locale/ht/torlauncher.properties | 2 + src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/hu/torlauncher.properties | 2 + src/chrome/locale/hy-AM/torlauncher.properties | 2 + src/chrome/locale/hy/torlauncher.properties | 2 + src/chrome/locale/ia/torlauncher.properties | 2 + src/chrome/locale/id/torlauncher.properties | 2 + src/chrome/locale/is/network-settings.dtd | 4 +- src/chrome/locale/is/torlauncher.properties | 2 + src/chrome/locale/it/network-settings.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 2 + src/chrome/locale/ja/torlauncher.properties | 2 + src/chrome/locale/jv/torlauncher.properties | 2 + src/chrome/locale/ka/torlauncher.properties | 2 + src/chrome/locale/kk/torlauncher.properties | 2 + src/chrome/locale/km/torlauncher.properties | 2 + src/chrome/locale/kn/torlauncher.properties | 2 + src/chrome/locale/ko-KR/network-settings.dtd | 2 +- src/chrome/locale/ko-KR/torlauncher.properties | 2 + src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 2 + src/chrome/locale/ku/torlauncher.properties | 2 + src/chrome/locale/kw/torlauncher.properties | 2 + src/chrome/locale/ky/torlauncher.properties | 2 + src/chrome/locale/lb/torlauncher.properties | 2 + src/chrome/locale/lg/torlauncher.properties | 2 + src/chrome/locale/ln/torlauncher.properties | 2 + src/chrome/locale/lo/torlauncher.properties | 2 + src/chrome/locale/lt/network-settings.dtd | 2 +- src/chrome/locale/lt/torlauncher.properties | 14 +-- src/chrome/locale/lv/torlauncher.properties | 2 + src/chrome/locale/mg/torlauncher.properties | 2 + src/chrome/locale/mi/torlauncher.properties | 2 + src/chrome/locale/mk/torlauncher.properties | 2 + src/chrome/locale/ml/torlauncher.properties | 2 + src/chrome/locale/mn/torlauncher.properties | 2 + src/chrome/locale/mr/torlauncher.properties | 2 + src/chrome/locale/ms-MY/torlauncher.properties | 2 + src/chrome/locale/ms/network-settings.dtd | 2 +- src/chrome/locale/ms/torlauncher.properties | 1 + src/chrome/locale/mt/torlauncher.properties | 2 + src/chrome/locale/my/torlauncher.properties | 2 + src/chrome/locale/nah/torlauncher.properties | 2 + src/chrome/locale/nap/torlauncher.properties | 2 + src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/nb/torlauncher.properties | 2 + src/chrome/locale/nds/torlauncher.properties | 2 + src/chrome/locale/ne/torlauncher.properties | 2 + src/chrome/locale/nl-BE/torlauncher.properties | 2 + src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/nl/torlauncher.properties | 2 + src/chrome/locale/nn/network-settings.dtd | 2 +- src/chrome/locale/nn/progress.dtd | 8 +- src/chrome/locale/nn/torlauncher.properties | 6 +- src/chrome/locale/nso/torlauncher.properties | 2 + src/chrome/locale/oc/torlauncher.properties | 2 + src/chrome/locale/or/torlauncher.properties | 2 + src/chrome/locale/pa/torlauncher.properties | 2 + src/chrome/locale/pap/torlauncher.properties | 2 + src/chrome/locale/pl-PL/network-settings.dtd | 2 +- src/chrome/locale/pl-PL/torlauncher.properties | 1 + src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 2 + src/chrome/locale/pms/torlauncher.properties | 2 + src/chrome/locale/ps/torlauncher.properties | 2 + src/chrome/locale/pt-BR/network-settings.dtd | 38 +++---- src/chrome/locale/pt-BR/progress.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 12 ++- src/chrome/locale/pt/network-settings.dtd | 2 +- src/chrome/locale/pt/torlauncher.properties | 2 + src/chrome/locale/ro/network-settings.dtd | 80 +++++++-------- src/chrome/locale/ro/progress.dtd | 2 +- src/chrome/locale/ro/torlauncher.properties | 24 +++-- src/chrome/locale/ru/torlauncher.properties | 2 + .../locale/ru(a)petr1708/torlauncher.properties | 4 +- src/chrome/locale/sco/torlauncher.properties | 2 + src/chrome/locale/si-LK/torlauncher.properties | 2 + src/chrome/locale/sk-SK/network-settings.dtd | 54 +++++----- src/chrome/locale/sk-SK/progress.dtd | 4 +- src/chrome/locale/sk-SK/torlauncher.properties | 10 +- src/chrome/locale/sk/torlauncher.properties | 2 + src/chrome/locale/sl-SI/torlauncher.properties | 2 + src/chrome/locale/sl/torlauncher.properties | 2 + src/chrome/locale/sn/torlauncher.properties | 2 + src/chrome/locale/so/torlauncher.properties | 2 + src/chrome/locale/son/torlauncher.properties | 2 + src/chrome/locale/sq-AL/torlauncher.properties | 1 + src/chrome/locale/sq/progress.dtd | 6 +- src/chrome/locale/sq/torlauncher.properties | 2 + src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr/progress.dtd | 2 +- src/chrome/locale/sr/torlauncher.properties | 40 ++++---- src/chrome/locale/sr(a)latin/torlauncher.properties | 2 + src/chrome/locale/st/torlauncher.properties | 2 + src/chrome/locale/su/torlauncher.properties | 2 + src/chrome/locale/sv-SE/network-settings.dtd | 2 +- src/chrome/locale/sv-SE/torlauncher.properties | 1 + src/chrome/locale/sv/torlauncher.properties | 2 + src/chrome/locale/sw/torlauncher.properties | 2 + src/chrome/locale/szl/torlauncher.properties | 2 + src/chrome/locale/ta/torlauncher.properties | 2 + src/chrome/locale/te-IN/torlauncher.properties | 2 + src/chrome/locale/te/torlauncher.properties | 2 + src/chrome/locale/tg/torlauncher.properties | 2 + src/chrome/locale/th/torlauncher.properties | 2 + src/chrome/locale/ti/torlauncher.properties | 2 + src/chrome/locale/tk/torlauncher.properties | 2 + src/chrome/locale/tr/torlauncher.properties | 2 + src/chrome/locale/uk/torlauncher.properties | 2 + src/chrome/locale/ur-PK/torlauncher.properties | 2 + src/chrome/locale/ur/torlauncher.properties | 2 + src/chrome/locale/uz/torlauncher.properties | 2 + src/chrome/locale/ve/torlauncher.properties | 2 + src/chrome/locale/vi/torlauncher.properties | 2 + src/chrome/locale/wa/torlauncher.properties | 2 + src/chrome/locale/wo/torlauncher.properties | 2 + .../locale/zh-CN.GB2312/torlauncher.properties | 1 + src/chrome/locale/zh-CN/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 2 + src/chrome/locale/zh-HK/torlauncher.properties | 2 + src/chrome/locale/zh-TW/network-settings.dtd | 68 ++++++------- src/chrome/locale/zh-TW/progress.dtd | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 60 +++++------ src/chrome/locale/zh/torlauncher.properties | 1 + src/chrome/locale/zu/torlauncher.properties | 2 + 203 files changed, 698 insertions(+), 389 deletions(-) diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ach/torlauncher.properties +++ b/src/chrome/locale/ach/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ady/torlauncher.properties +++ b/src/chrome/locale/ady/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/af-ZA/torlauncher.properties +++ b/src/chrome/locale/af-ZA/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ak/torlauncher.properties +++ b/src/chrome/locale/ak/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/am-ET/torlauncher.properties +++ b/src/chrome/locale/am-ET/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index c8bb154..3549bb6 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "إعادة تشغيل تور"> <!ENTITY torsettings.optional "اختياري"> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index a4fbe15..1a1882a 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=مُشغل تور torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوقع. +torlauncher.tor_connection_lost=قد تم فقدك اتصالك بشبكة تور. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. torlauncher.tor_control_failed=تعذر التحكم في تور. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر ب torlauncher.recommended_bridge=(موصى به) torlauncher.connect=اتصل +torlauncher.reconnect=إعادة الإتصال torlauncher.quit=إنهاء torlauncher.quit_win=خروج torlauncher.done=تم @@ -36,9 +38,9 @@ torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S torlauncher.bootstrapStatus.conn_dir=جارٍ الاتصال بدليل التحويلات -torlauncher.bootstrapStatus.handshake_dir=ينشئ اتصالا معمًى بالدليل -torlauncher.bootstrapStatus.requesting_status=يسترجع حالة الشبكة -torlauncher.bootstrapStatus.loading_status=يحمل حالة الشبكة +torlauncher.bootstrapStatus.handshake_dir=ينشئ اتصالا مشفرا بالدليل +torlauncher.bootstrapStatus.requesting_status=الحصول على حالة الشبكة +torlauncher.bootstrapStatus.loading_status=تحميل حالة الشبكة torlauncher.bootstrapStatus.loading_keys=يحمل شهادات السلطة torlauncher.bootstrapStatus.requesting_descriptors=يطلب معلومات التحويلة torlauncher.bootstrapStatus.loading_descriptors=يحمل معلومات التحويلة @@ -54,4 +56,4 @@ torlauncher.bootstrapWarning.identity=لم تتطابق الهوية torlauncher.bootstrapWarning.timeout=الاتصال عاطل torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=الناقل المضاف مفقود diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/arn/torlauncher.properties +++ b/src/chrome/locale/arn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index 9e02ff7..b59761b 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Çıx torlauncher.done=Done diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/bg-BG/torlauncher.properties +++ b/src/chrome/locale/bg-BG/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index 915da30..9073054 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -4,11 +4,12 @@ torlauncher.error_title=Тор лънчер torlauncher.tor_exited=Тор спря принудително +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт torlauncher.tor_failed_to_start=Тор не стартира успешно -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Неуспя да поеме контрол над Тор. +torlauncher.tor_bootstrap_failed=Тор неуспя да установи връзка с Тор мрежата. +torlauncher.tor_bootstrap_failed_details=%1$S несупя да (%2$S). torlauncher.unable_to_start_tor=Невъзможно е да се стартира Tor.\n\n%S torlauncher.tor_missing=Приложението "Tor" липсва. @@ -23,12 +24,13 @@ torlauncher.ensure_tor_is_running=Моля, уверете се, че Tor се torlauncher.error_proxy_addr_missing=Трябва да определите IP адрес или хост име и номер на порта, за да настроите Тор да използва прокси достъп до интернет. torlauncher.error_proxy_type_missing=Трябва да изберете вида на проксито. torlauncher.error_bridges_missing=Трябва да зададете един или повече бриджа -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Трябва да избереш вид транспорт за избраните мостове. +torlauncher.error_bridge_bad_default_type=Никой от избраните мостове няма траспорт от типса %S в наличност. Моля, нагласи настройките си. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(препоръчително) torlauncher.connect=Свържи се +torlauncher.reconnect=Reconnect torlauncher.quit=Край torlauncher.quit_win=Изход torlauncher.done=Готово @@ -54,4 +56,4 @@ torlauncher.bootstrapWarning.identity=несъвпадение с идентич torlauncher.bootstrapWarning.timeout=пауза на връзката torlauncher.bootstrapWarning.noroute=няма път до хоста torlauncher.bootstrapWarning.ioerror=грешка при четене/писане -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=липсва лесно свързуем транспорт diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/bn-IN/torlauncher.properties +++ b/src/chrome/locale/bn-IN/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index f46473e..21754aa 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -37,9 +37,9 @@ <!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "পোর্ট:"> +<!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম:"> +<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/bn/progress.dtd b/src/chrome/locale/bn/progress.dtd index ebd9cef..e324946 100644 --- a/src/chrome/locale/bn/progress.dtd +++ b/src/chrome/locale/bn/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "টর অবস্থা"> +<!ENTITY torprogress.openSettings "সেটিংস খুলুন"> +<!ENTITY torprogress.heading "টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে"> +<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কের সাথে সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।"> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index b6b7bd4..f77c6fe 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done @@ -42,7 +44,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/bo/torlauncher.properties +++ b/src/chrome/locale/bo/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index e3b08d8..306f505 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(erbedet) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties index 0157189..d82d688 100644 --- a/src/chrome/locale/ca-ES/torlauncher.properties +++ b/src/chrome/locale/ca-ES/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 29b22a2..161efa0 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Inicialitzador Tor torlauncher.tor_exited=Tor ha sortit inesperadament. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor torlauncher.tor_failed_to_start=Tor ha fallat al iniciar. torlauncher.tor_control_failed=No s'ha pogut prendre el control de Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hi ha ponts subministrats que tingu torlauncher.recommended_bridge=(recomanat) torlauncher.connect=Conectar +torlauncher.reconnect=Reconnect torlauncher.quit=Surt torlauncher.quit_win=Surt torlauncher.done=Fet diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index dadbdda..0458e75 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -27,7 +27,6 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restartTor ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/cs-CZ/torlauncher.properties +++ b/src/chrome/locale/cs-CZ/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index cded48b..caa3810 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor spouštěč torlauncher.tor_exited=Tor znenadání skončil. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor. torlauncher.tor_failed_to_start=Tor nenastartoval. torlauncher.tor_control_failed=Nezdařilo se převzít kontrolu nad Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Nejsou zadané žádné bridge, které torlauncher.recommended_bridge=(doporučeno) torlauncher.connect=Připojit +torlauncher.reconnect=Reconnect torlauncher.quit=Ukoncit torlauncher.quit_win=Konec torlauncher.done=Hotovo diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/csb/torlauncher.properties +++ b/src/chrome/locale/csb/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index 8dd497d..8551533 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.address "Адрĕс:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Порчĕ:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Ячĕ:"> <!ENTITY torsettings.useProxy.password "Кĕме сăмах:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties index 9dc1f18..b68511b 100644 --- a/src/chrome/locale/cv/torlauncher.properties +++ b/src/chrome/locale/cv/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Çыхăнтар +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index a2e6a2a..2fce140 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lansiwr Tor torlauncher.tor_exited=Gadawodd Tor ar hap. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor. torlauncher.tor_failed_to_start=Methodd Tor gychwyn. torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r torlauncher.recommended_bridge=(awgrymwyd) torlauncher.connect=Cysylltu +torlauncher.reconnect=Reconnect torlauncher.quit=Cau torlauncher.quit_win=Gadael torlauncher.done=Wedi gorffen diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 13d9a5c..12bb8af 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttype torlauncher.recommended_bridge=(Anbefalet) torlauncher.connect=Tilslut +torlauncher.reconnect=Reconnect torlauncher.quit=Afslut torlauncher.quit_win=Afslut torlauncher.done=Færdig diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 4af4483..1409260 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet …"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Tor neustarten"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 5f7b2f7..7ef626d 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor-Starter torlauncher.tor_exited=Tor wurde unerwartet geschlossen. +torlauncher.tor_connection_lost=Ihre Verbindung zum Tor-Netzwerk ist verloren gegangen. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen. torlauncher.tor_control_failed=Fehler, die Kontrolle über Tor zu übernehmen. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücke torlauncher.recommended_bridge=(empfohlen) torlauncher.connect=Verbinden +torlauncher.reconnect=Wieder verbinden torlauncher.quit=Schließen torlauncher.quit_win=Beenden torlauncher.done=Fertig diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/dz/torlauncher.properties +++ b/src/chrome/locale/dz/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/el-GR/torlauncher.properties +++ b/src/chrome/locale/el-GR/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 132bea8..a9a6bfd 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,18 +1,18 @@ -<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου "> +<!ENTITY torsettings.dialog.title "TorΡυθμίσεις Δικτύου ">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Πριν συνδεθείτε στο δίκτυο Tor, θα χρειαστούμε λίγες πληροφορίες για το πώς συνδέεστε στο Internet."> <!ENTITY torSettings.yes "Ναι"> <!ENTITY torSettings.no "Οχι"> <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο διαδικτυο αυτού του υπολογιστή λογοκρινετε, φιλτραρετε ή εμποδιζετε γενικως. "> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Χρειάζονται ρυθμίσεις για τις γέφυρες, για το firewall, ή για τον proxy μου."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connectPrompt2 "Θα ήθελα να συνδεθεί άμεσα με το δίκτυο Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση"> <!ENTITY torSettings.proxyQuestion "Μήπως αυτός ο υπολογιστής πρέπει να χρησιμοποιήση έναν διακομιστή μεσολάβησης για πρόσβαση στο Διαδίκτυο;"> @@ -22,14 +22,15 @@ <!ENTITY torSettings.firewallQuestion "Πηγαίνει μέσω ενός τείχους προστασίας που επιτρέπει μόνο συνδέσεις σε ορισμένες θύρες σύνδεσης Internet αυτού του υπολογιστή;"> <!ENTITY torSettings.firewallHelp "Εάν δεν είστε βέβαιοι πώς να απαντήσετε στο ερώτημα αυτό, επιλέξτε Όχι. Εάν αντιμετωπίζετε προβλήματα με τη σύνδεση με το δίκτυο Tor, αλλάξτε αυτή τη ρύθμιση. "> <!ENTITY torSettings.enterFirewall "Πληκτρολογήστε μια λίστα διαχωρισμένη με κόμματα των θυρών που επιτρέπονται από το firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Γνωρίζετε αν ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο ελέγχει συνδέσεις +στο δίκτυο Tor?"> +<!ENTITY torSettings.bridgeHelp "Αν δε ξέρετε πώς να απαντήσετε εδώ, επιλέξτε "Όχι".  Αν επιλέξετε "Ναι", θα σας ζητήσω να ρυθμίσετε γέφυρες Tor, που είναι μη ευρέως γνωστά κανάλια εισόδου στο δίκτυο Tor, που δυσκολεύουν όσους προσπαθούν να μπλοκάρουν τις συνδέσεις στο δίκτυο Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε και εισάγετε νέες διευθύνσεις γεφυρών.">  <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... "> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Eπανεκκίνηση Tor"> <!ENTITY torsettings.optional "Προεραιτικα"> @@ -46,19 +47,19 @@ <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> <!ENTITY torsettings.useBridges.checkbox "Ο πάροχος διαδικτυου (ISP) μπλοκάρει τις συνδέσεις στο δίκτυο του Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.default "Σύνδεση με προκαθορισμένες γέφυρες"> +<!ENTITY torsettings.useBridges.type "Τύπος μεταφοράς:"> +<!ENTITY torsettings.useBridges.custom "Εισαγωγή άλλων γεφυρών"> +<!ENTITY torsettings.useBridges.label "Εισάγετε μια ή περισσότερες διευθύνσεις γεφυρών (μία ανά γραμμή)."> +<!ENTITY torsettings.useBridges.placeholder "τύπος διεύθυνση:πόρτα"> <!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο"> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Αν δε μπορείτε να συνδεθείτε στο δίκτυο Tor, ίσως ο πάροχός (ISP) σας ή κάποιος τρίτος μπλοκάρει το Tor .  Αυτό το πρόβλημα συνήθως λύνεται με τη χρήση Tor Bridges (γέφυρες), που είναι μη δημοσιευμένες διευθύνσεις από τις οποίες μπορείτε να μπείτε στο δίκτυο Tor, συνεπώς πιο δύσκολο να μπλοκαριστούν."> +<!ENTITY torsettings.bridgeHelp1B "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε νέες διυθύνσεις γεφυρών με έναν από τους παρακάτω τρεις τρόπους:"> +<!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> +<!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> +<!ENTITY torsettings.bridgeHelp3 "Στείλτε email στο bridges(a)torproject.org με μόνο με τις λέξεις 'get bridges' στο κείμενο.  Για να δυσκολέψουμε τους αντιπάλους μας που θέλουν μα μάθουν πολλές διευθύνσεις γεφυρών, δεχόμαστε μηνύματα μόνο από διευθύνσεις που τελειώνουν σε gmail.com ή yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> +<!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index 74ccbe4..5ea3b28 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Το Tor σταμάτησε απροσδόκητα +torlauncher.tor_connection_lost= Η σύνδεση στο δίκτυο Tor χάθηκε. torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor. torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor. torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Δεν υπάρχουν γέφυρες torlauncher.recommended_bridge=(συνιστάται) torlauncher.connect=Σύνδεση +torlauncher.reconnect=Επανασύνδεση torlauncher.quit=Έξοδος torlauncher.quit_win=Έξοδος torlauncher.done=Τελος diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/en-GB/torlauncher.properties +++ b/src/chrome/locale/en-GB/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 4eaf84a..5cfa121 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Eliri torlauncher.done=Done diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index d62b2fb..d494033 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lanzador de Tor torlauncher.tor_exited=Salida inesperada de Tor +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor torlauncher.tor_control_failed=Falló toma de control de Tor @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar +torlauncher.reconnect=Reconnect torlauncher.quit=Quitar torlauncher.quit_win=Salir torlauncher.done=Hecho diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/es-CO/torlauncher.properties +++ b/src/chrome/locale/es-CO/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index a2bc877..dc1309a 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.yes "Si"> <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> @@ -39,7 +39,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Puerto:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Contraseña:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 3507a38..52f013c 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -4,11 +4,12 @@ torlauncher.error_title=Lanzador Tor torlauncher.tor_exited=Tor se cerró inesperadamente. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=No se pudo conectar con el puerto de control Tor torlauncher.tor_failed_to_start=Tor falló al iniciar. torlauncher.tor_control_failed=Falló al tomar control de Tor. torlauncher.tor_bootstrap_failed=Tor falló al establecer conexión con la red Tor. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. @@ -16,19 +17,20 @@ torlauncher.torrc_missing=Falta el archivo torrc. torlauncher.datadir_missing=El diccionario de datos de Tor no existe. torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.failed_to_get_settings=No se puede recuperar la configuración de Tor. \n\n% S +torlauncher.failed_to_save_settings=No se puede grabar la coonfiguración de Tor.\n\n%S torlauncher.ensure_tor_is_running=Por favor asegúrese que Tor esté en funcionamiento. torlauncher.error_proxy_addr_missing=Debes especificar ambos, una dirección IP o un hostname y un número de puerto para configurar Tor para usar un proxy y acceder a Internet torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los puentes proporcionados. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_bridge_bad_default_type=Ningún puente proporcionado que tenga el tipo de transporte %S está disponibole. Por favor, ajuste su configuración. torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar +torlauncher.reconnect=Reconnect torlauncher.quit=Abandonar torlauncher.quit_win=Salir torlauncher.done=Hecho diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties index b6b7bd4..d04cac5 100644 --- a/src/chrome/locale/es-NI/torlauncher.properties +++ b/src/chrome/locale/es-NI/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 24760dc..dd1d82d 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando a que Tor arranque..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd index c07d8fb..1d3683d 100644 --- a/src/chrome/locale/es/progress.dtd +++ b/src/chrome/locale/es/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Preferencias"> -<!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras se establece una conexión con la red Tor."> +<!ENTITY torprogress.heading "Conectando con la red de Tor"> +<!ENTITY torprogress.pleaseWait "Espere mientras se establece una conexión con la red de Tor."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 192d1ed..7edc87e 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. +torlauncher.tor_connection_lost=Se ha perdido su conexión a la red Tor. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor pu torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar +torlauncher.reconnect=Reconectar torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 3440bbe..01de316 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Valmis diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 6a7e78a..3f4a852 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor abiarazlea torlauncher.tor_exited=Tor ustekabean irten da. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota d torlauncher.recommended_bridge=(gomendatuta) torlauncher.connect=Konektatu +torlauncher.reconnect=Reconnect torlauncher.quit=Irten torlauncher.quit_win=Irten torlauncher.done=Eginda diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index b1294d8..136acea 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -17,7 +17,7 @@ <!ENTITY torSettings.proxyQuestion "آیا این رایانه برای اتصال به اینترنت نیاز به استفاده از پراکسی دارد؟">  -<!ENTITY torSettings.proxyHelp "اگر مطمئن نیستید چطور به اسن سوال پاسخ دهید، به تنظیمات سایر مرورگرهای خود نگاهی بیاندازید تا متوجه شوید که آیا باید یک پروکسی استفاده شود یا خیر."> +<!ENTITY torSettings.proxyHelp "اگر مطمئن نیستید چطور به این سوال پاسخ دهید، به تنظیمات سایر مرورگرهای خود نگاهی بیاندازید تا متوجه شوید که آیا باید یک پروکسی استفاده شود یا خیر."> <!ENTITY torSettings.enterProxy "تنظیمات پراکسی را وارد کنید."> <!ENTITY torSettings.firewallQuestion "آیا در مسیر ارتباط شما به اینترنت یک فایروال وجود دارد؟ و فقط اجازه اتصال از یک درگاه خاص را می دهد؟"> <!ENTITY torSettings.firewallHelp "اگر مطمئن نیستید چه جوابی به این سوال دهید، «نه» و یا «خیر» را انتخاب کنید. سپس اگر مشکلی در ارتباط با شبکه تور داشتید، این مورد را تغییر دهید."> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 448b0b8..18906ed 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -3,18 +3,19 @@ torlauncher.error_title=اجرا کننده تور -torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد. -torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد. +torlauncher.tor_exited=تور به‌دلیلی نامشخص خارج شد. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی‌باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. torlauncher.tor_bootstrap_failed=تور در برقراری یک ارتباط شبکه‌ای توری ناموفق بود. torlauncher.tor_bootstrap_failed_details=%1$S ناموفق بود (%2$S). torlauncher.unable_to_start_tor=راه اندازی تور امکان پذیر نمی باشد.\n\n%S -torlauncher.tor_missing=تور اجرا شونده یافت نشد. -torlauncher.torrc_missing=فایل torrc پیدا نشده‌است. +torlauncher.tor_missing=فایل اجرایی تور یافت نشد. +torlauncher.torrc_missing=فایل torrc یافت نشد. torlauncher.datadir_missing=لیست داده تور وجود ندارد. -torlauncher.password_hash_missing=ناموفق در دریافت کلمه عبور رمزنگاری شده. +torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات تور.\n\n%S torlauncher.failed_to_save_settings=ناموفق در ذخیره تنظیمات تور.\n\n%S @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجو torlauncher.recommended_bridge=(توصیه شده) torlauncher.connect=اتصال +torlauncher.reconnect=Reconnect torlauncher.quit=خروج torlauncher.quit_win=خروج torlauncher.done=انجام شد diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 4bf8d6d..f8d6644 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -1,35 +1,35 @@ -<!ENTITY torsettings.dialog.title "Torin Verkko Asetukset"> +<!ENTITY torsettings.dialog.title "Torin Verkkoasetukset">  -<!ENTITY torsettings.prompt "Ennen kuin voit yhdistää Tor verkkoon, sinun pitää antaa tietoa tietokoneesi internet yhteydestä"> +<!ENTITY torsettings.prompt "Ennen kuin voit yhdistää Tor verkkoon, sinun pitää antaa tietoa tietokoneesi internet yhteydestä."> <!ENTITY torSettings.yes "Kyllä"> <!ENTITY torSettings.no "Ei"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.firstQuestion "Mikä seuraavista kuvailee parhaiten tilannettasi?"> +<!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet yhteys on sensuroitu, suodatettu tai proxattu."> +<!ENTITY torSettings.configurePrompt2 "Minun täytyy määrittää silta-, palomuuri- tai välityspalvelinasetuksia."> +<!ENTITY torSettings.configure "Määritä"> +<!ENTITY torSettings.connectPrompt2 "Haluan yhdistää suoraan Torin verkkoon."> <!ENTITY torSettings.connectPrompt3 "Tämä toimii monissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämä tietokone proxya päästäkseen internettiin?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "Ellet ole varma, kuinka vastata tähän kysymykseen, katso Internet asetukset toisessa selaimessa nähdäksesi onko se määritetty käyttämään välityspalvelinta."> <!ENTITY torSettings.enterProxy "Mene proxy asetuksiin."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallQuestion "Kulkeeko tietokoneen Internet-yhteys palomuurin läpi, joka hyväksyy yhteydet ainoastaan tiettyihin portteihin?"> <!ENTITY torSettings.firewallHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse Ei. Muuta tätä asetusta jos yhteyden saamisessa Tor-verkkoon on ongelmia."> <!ENTITY torSettings.enterFirewall "Luettele pilkuin erotettuina ne portit, jotka palomuuri sallii. "> <!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse No.  Jos valitset Kyllä, sinua pyydetään määrittämään Torin Sillat, jotka ovat listaamattomia releitä, jotta yhteyksiä olisi vaikeampi estää Torin verkkoon yhdistettäessä."> +<!ENTITY torSettings.bridgeSettingsPrompt "Voit käyttää edellytettyjä silta-yhteyksiä tai voit saada ja osallistua mukautettuihin siltasarjaan.">  <!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> <!ENTITY torsettings.optional "Vaihtoehtoinen"> @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta."> <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:"> <!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoaja (ISP) estää yhteydet Tor verkkoon."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "Yhteys edellytetyillä silloilla."> <!ENTITY torsettings.useBridges.type "Siirtotyyppi:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.custom "Mene mukautettuihin siltoihin"> +<!ENTITY torsettings.useBridges.label "Mene yhteen tai useampaan silta releeseen (yksi per rivi)."> +<!ENTITY torsettings.useBridges.placeholder "syötä osoite:portti"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.copyLog "Kopioi Torin Loki Leikepöydälle"> +<!ENTITY torsettings.bridgeHelpTitle "Siltarele-apu"> +<!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistämään Torin verkkoon, syy voi olla, että Internet palveluntarjoajasi (ISP) tai muu taho estää Tor.  Usein, voit kiertää tämän ongelman käyttämällä Torin siltoja, jotka ovat listaamattomia releitä, jotka on vaikeampi estää."> +<!ENTITY torsettings.bridgeHelp1B "Voit käyttää esimääritettyjä, edellytettyjä siltaosoitesarjoja tai voit saada mukautetun osoitesarjan käyttämällä näitä kolmea menetelmää:"> +<!ENTITY torsettings.bridgeHelp2Heading "Verkon yli"> +<!ENTITY torsettings.bridgeHelp2 "Käytä internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Sähköpostin Automaattivastaajan läpi"> <!ENTITY torsettings.bridgeHelp3 "Lähetä sähköpostia: bridges(a)torproject.org tekstin kanssa 'get bridges' 160"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi"> +<!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help(a)rt.torproject.org.  Huomioi, että henkilön tulee vastata kuhunkin pyyntöön."> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index 809b90c..21ade8d 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor-käynnistin torlauncher.tor_exited=Tor lopetti toimintansa yllättäen. +torlauncher.tor_connection_lost=Yhteytesi Tor-verkkoon on katkennut. torlauncher.tor_controlconn_failed=Ei voi ottaa yhteyttä Tor-hallintaporttiin. torlauncher.tor_failed_to_start=Tor ei käynnistynyt. torlauncher.tor_control_failed=Torin haltuun ottaminen epäonnistui. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Tarjolla olevissa silloissa ei ole saa torlauncher.recommended_bridge=(suositeltu) torlauncher.connect=Yhdistä +torlauncher.reconnect=Yhdistä uudelleen torlauncher.quit=Lopeta torlauncher.quit_win=Lopeta torlauncher.done=Valmis diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index b840d23..bd52ca0 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Makipag-ugnay"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index ebd9cef..372f1af 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> +<!ENTITY torprogress.heading "Kumukonekta sa network ng Tor"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index 64e5fbb..b69659f 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -1,57 +1,59 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.quit=Quit -torlauncher.quit_win=Labasan +torlauncher.error_title=Tagapaglunsad ng Tor + +torlauncher.tor_exited=Hindi inaasahang tumigil ang Tor. +torlauncher.tor_connection_lost=Ang iyong koneksyon sa Tor Network ay nawala. +torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. +torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor. +torlauncher.tor_control_failed=Nabigong kontrolin ang Tor. +torlauncher.tor_bootstrap_failed=Nabigong magtatag ang Tor ng koneksyon sa network Tor. +torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S). + +torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S +torlauncher.tor_missing=Ang Tor executable ay nawawala. +torlauncher.torrc_missing=Ang torrc file ay nawawala. +torlauncher.datadir_missing=Walang direktoryo ng data ang Tor. +torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password. + +torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S +torlauncher.failed_to_save_settings=Hindi mai-save ang mga setting ng Tor. +torlauncher.ensure_tor_is_running=Mangyaring tiyakin na ang Tor ay tumatakbo. + +torlauncher.error_proxy_addr_missing=Kailangan mong kapwa tukuyin ang isang IP address o hostname at isang numero ng port upang i-configure ang Tor na gumamit ng isang proxy upang makapasok sa Internet. +torlauncher.error_proxy_type_missing=Dapat mong piliin ang uri ng proxy. +torlauncher.error_bridges_missing=Kailangan mong tukuyin ang isa o higit pang mga tulay. +torlauncher.error_default_bridges_type_missing=Dapat kang pumili ng uri ng transportasyon para sa mga ibinigay na tulay. +torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibinigay na uri ng transportasyong tulay %S. Mangyaring ayusin ang iyong mga setting. + +torlauncher.recommended_bridge=(rekomendado) + +torlauncher.connect=Kumonekta +torlauncher.reconnect=Muling kumonekta +torlauncher.quit=Tumigil +torlauncher.quit_win=Lumabas torlauncher.done=Tapos na -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S + +torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay +torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon +torlauncher.bootstrapStatus.requesting_status=Kinukuha ang katayuan ng network +torlauncher.bootstrapStatus.loading_status=Ikinakarga ang katayuan ng network +torlauncher.bootstrapStatus.loading_keys=Ikinakarga ang mga sertipiko ng awtoridad +torlauncher.bootstrapStatus.requesting_descriptors=Humihiling ng impormasyon tungkol sa relay +torlauncher.bootstrapStatus.loading_descriptors=Ikinakarga ang impormasyon tungkol sa relay +torlauncher.bootstrapStatus.conn_or=Kumukonekta sa network ng Tor +torlauncher.bootstrapStatus.handshake_or=Nagtatatag ng Tor circuit +torlauncher.bootstrapStatus.done=Nakakonekta sa Tor Network. + +torlauncher.bootstrapWarning.done=tapos na +torlauncher.bootstrapWarning.connectrefused=hindi tinanggap ang koneksyon +torlauncher.bootstrapWarning.misc=samut-sari +torlauncher.bootstrapWarning.resourcelimit=hindi sapat ang mga mapagkukunan +torlauncher.bootstrapWarning.identity=maling pagtutugma ng pagkakakilanlan +torlauncher.bootstrapWarning.timeout=Nag-timeout ang koneksyon +torlauncher.bootstrapWarning.noroute=walang ruta papunta sa host +torlauncher.bootstrapWarning.ioerror=pagkakamali sa pagbasa/pagsulat +torlauncher.bootstrapWarning.pt_missing=nawawala transportasyong pluggable diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 3ef3b9e..e8673f3 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Redémarrer Tor"> <!ENTITY torsettings.optional "Optionnel"> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index d7352f2..3a5372a 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lanceur Tor torlauncher.tor_exited=Tor a quitté de manière imprévue. +torlauncher.tor_connection_lost=Votre connexion au réseau Tor a été perdue. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Aucun pont ayant le type de transport torlauncher.recommended_bridge=(recommandé) torlauncher.connect=Se connecter +torlauncher.reconnect=Se reconnecter torlauncher.quit=Quitter torlauncher.quit_win=Sortir torlauncher.done=Fait diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 826e958..3ebad6c 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Relancer Tor"> <!ENTITY torsettings.optional "Optionnel"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index ac7a128..874e6af 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lanceur Tor torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. +torlauncher.tor_connection_lost=Votre connexion à Tor a été perdue. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=Échec lors de la prise de contrôle de Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type torlauncher.recommended_bridge=(recommandé) torlauncher.connect=Se connecter +torlauncher.reconnect=Reconnecter torlauncher.quit=Quitter torlauncher.quit_win=Sortir torlauncher.done=Terminé diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/fur/torlauncher.properties +++ b/src/chrome/locale/fur/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index 9526a00..c0a6d84 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -4,10 +4,11 @@ torlauncher.error_title=Lanzador do Tor torlauncher.tor_exited=O Tor saíu de vez. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor. torlauncher.tor_failed_to_start=Non se puido iniciar o Tor. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor fallou ao establecer a conexion coa rede Tor. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Non se puido iniciar o Tor.⏎\n⏎\n%S @@ -26,10 +27,11 @@ torlauncher.error_bridges_missing=Debe especificar unha ou máis pontes. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar -torlauncher.quit=Abandonar +torlauncher.reconnect=Reconnect +torlauncher.quit=Abandoar torlauncher.quit_win=Saír torlauncher.done=Feito diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/gun/torlauncher.properties +++ b/src/chrome/locale/gun/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ha/torlauncher.properties +++ b/src/chrome/locale/ha/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 6bfcbb2..ddc5d61 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=משגר Tor torlauncher.tor_exited=‏Tor יצא במפתיעה. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=לא הצליח להתחבר ליציאת שליטת Tor. torlauncher.tor_failed_to_start=Tor נכשל בהפעלה. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=התחבר +torlauncher.reconnect=Reconnect torlauncher.quit=יציאה torlauncher.quit_win=צא torlauncher.done=הושלם diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 1eeddb6..4a31e93 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "नहीं"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index eae3f46..65fe1e6 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -2,17 +2,18 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Prije nego se spojite na Tor mrežu, trebate dati informacija o +internetskoj vezi ovog računala."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "Internetska veza ovog računala je cenzurirana, filtrirana ili prolazi kroz proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati bridge, firewall ili proxy postavke."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connectPrompt2 "Želim se izravno spojiti na Tor mrežu."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> <!ENTITY torSettings.connect "Spajanje"> <!ENTITY torSettings.proxyQuestion "Koristi li ovo računalo proxy za pristup Internetu?"> @@ -22,9 +23,11 @@ <!ENTITY torSettings.firewallQuestion "Prolazi li Internet veza ovog računala kroz vatrozid koji dopušta spajanje samo na određene portove?"> <!ENTITY torSettings.firewallHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite "Ne". Ako uočite probleme pri spajanju na Tor mrežu, promijenite ovu postavku."> <!ENTITY torSettings.enterFirewall "Unesite popis portova, odvojenih zarezom, koji su dopušteni na vatrozidu."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Blokira li vaš Internet Service Provider (ISP) ili ikako cenzurira veze +s Tor mrežom?"> +<!ENTITY torSettings.bridgeHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, odaberite Ne.  Ako odaberete Da, zatražit će vas da konfigurirate Tor Mostove, koji su neizlistani releji koji otežavaju +blokiranje konekcija s Tor mrežom"> +<!ENTITY torSettings.bridgeSettingsPrompt "Možete koristiti osigurani set bridge adresa ili možete unijeti vlasiti set mostova.">  @@ -46,19 +49,23 @@ <!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> <!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Spoji se s osiguranim mostovima"> +<!ENTITY torsettings.useBridges.type "Tip transporta:"> +<!ENTITY torsettings.useBridges.custom "Unesi vlastite mostove"> <!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> <!ENTITY torsettings.bridgeHelpTitle "Pomoć za bridge relej"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, to može biti zato što vaš ISP ili druga agencija blokira Tor.  Najčešće možete zaobići ovaj problem koristeći Tor Bridges, koji su neizlistani releji koje je teže blokirati."> +<!ENTITY torsettings.bridgeHelp1B "Možete koristiti već konfigurirani, osigurani set bridge adresa ili možete dobiti +vlastiti set adresa koristeći jednu od ove tri metode:"> +<!ENTITY torsettings.bridgeHelp2Heading "Kroz Web"> +<!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Kroz Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Pošaljite email na bridges(a)torproject.org samo s tekstom 'get bridges' u sadržaju +poruke.  No, kako bi napadačima bilo teže naučiti mnogo bridge adresa, morate +poslati ovaj zahtjev sa gmail.com ili yahoo.com email adrese."> +<!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> +<!ENTITY torsettings.bridgeHelp4 "U najgorem slučaju, možete zatražiti bridge adrese tako što pošaljete pristojan email na help(a)rt.torproject.org.  Imajte na umu da neće odgovoriti na svaki +zahtjev."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index 26e2174..daa86fa 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Pokretač Tora torlauncher.tor_exited=Tor je neočekivano izašao. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti. torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji torlauncher.recommended_bridge=(preporučeno) torlauncher.connect=Spajanje +torlauncher.reconnect=Reconnect torlauncher.quit=Odustani torlauncher.quit_win=Izlaz torlauncher.done=Gotovo @@ -54,4 +56,4 @@ torlauncher.bootstrapWarning.identity=nepodudaranje identiteta torlauncher.bootstrapWarning.timeout=vrijeme čekanja veze isteklo torlauncher.bootstrapWarning.noroute=nema rute do domaćina torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=nedostaje pluggable transport diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index b493793..54a9c06 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Poveži se +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ht/torlauncher.properties +++ b/src/chrome/locale/ht/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 809421f..54b862a 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Tor újraindítása"> <!ENTITY torsettings.optional "Opcionális"> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index 1cd7c59..47d9543 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Indító torlauncher.tor_exited=A Tor váratlanul kilépett. +torlauncher.tor_connection_lost=A kapcsolat a Tor hálózattal megszakadt. torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak. torlauncher.tor_control_failed=Nem sikerült átvenni a Tor vezérlését. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az átviteli torlauncher.recommended_bridge=(ajánlott) torlauncher.connect=Csatlakozás +torlauncher.reconnect=Újrakapcsolódás torlauncher.quit=Kilépés torlauncher.quit_win=Kilépés torlauncher.done=Kész diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties index 4de491e..4cacf25 100644 --- a/src/chrome/locale/hy-AM/torlauncher.properties +++ b/src/chrome/locale/hy-AM/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor-ի թողարկման սխալ; torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Միանալ +torlauncher.reconnect=Reconnect torlauncher.quit=Չեղարկել torlauncher.quit_win=Ելք torlauncher.done=Պատրաստ է diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/hy/torlauncher.properties +++ b/src/chrome/locale/hy/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties index 6eabb72..300a337 100644 --- a/src/chrome/locale/ia/torlauncher.properties +++ b/src/chrome/locale/ia/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quitar torlauncher.quit_win=Sortir torlauncher.done=Done diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index 6f9480b..679374c 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor gagal untuk memulai. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Hubungi +torlauncher.reconnect=Reconnect torlauncher.quit=Berhenti torlauncher.quit_win=Keluar torlauncher.done=Selesai. diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index f46473e..6a7609a 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Já"> +<!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index a4e4ce7..d882dc5 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Hætta torlauncher.done=Done diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 7cece0e..084c264 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Riavvia Tor"> <!ENTITY torsettings.optional "Facoltativo"> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index a6fc382..731ced4 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è arrestato inaspettatamente. +torlauncher.tor_connection_lost=La tua connesione alla rete Tor è stata persa. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il torlauncher.recommended_bridge=(raccomandato) torlauncher.connect=Connetti +torlauncher.reconnect=Riconnettiti torlauncher.quit=Esci torlauncher.quit_win=Esci torlauncher.done=Fatto diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index f08b28f..a234677 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Torは予期せず終了しました。 +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 torlauncher.tor_control_failed=Tor の制御に失敗しました。 @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S が torlauncher.recommended_bridge=(推奨) torlauncher.connect=接続 +torlauncher.reconnect=Reconnect torlauncher.quit=終了 torlauncher.quit_win=終了 torlauncher.done=完了 diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/jv/torlauncher.properties +++ b/src/chrome/locale/jv/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index 7663cdf..bd0a264 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor torlauncher.tor_exited=បានចេញពី Tor ដោយមិនរំពឹងទុក +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=មិនអាចភ្ជាប់ទៅច្រកពិនិត្យរបស់ Tor torlauncher.tor_failed_to_start=បានបរាជ័យក្នុងការចាប់ផ្ដើម Tor torlauncher.tor_control_failed=បានបរាជ័យក្នុងការពិនិត្យ Tor ។ @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=គ្មានប៊្រីត torlauncher.recommended_bridge=(បានផ្ដល់អនុសាសន៍) torlauncher.connect=តភ្ជាប់ +torlauncher.reconnect=Reconnect torlauncher.quit=ចេញ torlauncher.quit_win=ចាកចេញ torlauncher.done=រួចរាល់ diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties index 258712d..3f563cb 100644 --- a/src/chrome/locale/kn/torlauncher.properties +++ b/src/chrome/locale/kn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index daad46c..c2ed7fb 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "네"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "아니오"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index 7c34c45..7bcdc5a 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=나가기 torlauncher.done=Done diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index e35599c..b64c5c1 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Tor 시작 대기 중..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Tor 재시작"> <!ENTITY torsettings.optional "선택"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index a29cd25..d572091 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor 브라우저 Launcher torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. +torlauncher.tor_connection_lost=Tor 네트워크 연결에 실패하였습니다 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. torlauncher.tor_failed_to_start=Tor 시작 실패. torlauncher.tor_control_failed=Tor 제어에 실패했습니다. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리 torlauncher.recommended_bridge=(권장함) torlauncher.connect=연결 +torlauncher.reconnect=재연결 torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료 diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ku/torlauncher.properties +++ b/src/chrome/locale/ku/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/kw/torlauncher.properties +++ b/src/chrome/locale/kw/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 7bb504b..4f8fbb2 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Чыгуу torlauncher.done=Done diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/lg/torlauncher.properties +++ b/src/chrome/locale/lg/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ln/torlauncher.properties +++ b/src/chrome/locale/ln/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index c45457f..959d2d9 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Prisijungti"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 5ae3d6d..dedd011 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -4,13 +4,14 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_failed_to_start=Tor nepavyko paleisti. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor nepavyko užmegzti ryšio su Tor tinklu. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing. torlauncher.datadir_missing=The Tor data directory does not exist. @@ -26,10 +27,11 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(rekomenduojama) -torlauncher.connect=Connect -torlauncher.quit=Quit +torlauncher.connect=Prisijungti +torlauncher.reconnect=Reconnect +torlauncher.quit=Nutraukti torlauncher.quit_win=Išeiti torlauncher.done=Atlikta diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index cbe0e1b..80e8f61 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor palaidējs torlauncher.tor_exited=Tor negaidīti beidza darbu. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Nevarēja veikt savienojumu ar Tor kontrolportu. torlauncher.tor_failed_to_start=Tor'am neizdevās startēt. torlauncher.tor_control_failed=Neizdevās pārņemt Tor vadību. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Nav piedāvātu tiltu ar transporta ve torlauncher.recommended_bridge=(ieteicami) torlauncher.connect=Veidot savienojumu +torlauncher.reconnect=Reconnect torlauncher.quit=Beigt torlauncher.quit_win=Iziet torlauncher.done=Gatavs diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/mg/torlauncher.properties +++ b/src/chrome/locale/mg/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/mi/torlauncher.properties +++ b/src/chrome/locale/mi/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 98452de..b708f1f 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Излез torlauncher.done=Done diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/mn/torlauncher.properties +++ b/src/chrome/locale/mn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index b29d8cf..d40c2a0 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=टॉर लाँचर torlauncher.tor_exited=टॉर अनपेक्षितपणे बंद झाले. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=टॉर नियंत्रण पोर्टला जोडण्यात अपयश. torlauncher.tor_failed_to_start=टॉर सुरू होण्यात अपयश. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=जोडा +torlauncher.reconnect=Reconnect torlauncher.quit=बाहेर पडा torlauncher.quit_win=बंद करा torlauncher.done=झाले diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index 74f8ff9..8bcd08e 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Pelancar Tor torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor. torlauncher.tor_failed_to_start=Tor gagal untuk bermula. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Menyambung +torlauncher.reconnect=Reconnect torlauncher.quit=Henti torlauncher.quit_win=Keluar torlauncher.done=Selesai diff --git a/src/chrome/locale/ms/network-settings.dtd b/src/chrome/locale/ms/network-settings.dtd index 0285f9a..723a055 100644 --- a/src/chrome/locale/ms/network-settings.dtd +++ b/src/chrome/locale/ms/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restartTor ""> +<!ENTITY torsettings.restart ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties index 0e49bc8..fcd4d83 100644 --- a/src/chrome/locale/ms/torlauncher.properties +++ b/src/chrome/locale/ms/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/mt/torlauncher.properties +++ b/src/chrome/locale/mt/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index 3c09784..628cd89 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=ထွက်ရန် torlauncher.quit_win=ထွက်ရန် torlauncher.done=Done diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/nah/torlauncher.properties +++ b/src/chrome/locale/nah/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/nap/torlauncher.properties +++ b/src/chrome/locale/nap/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index c9e12b4..fb5bd9b 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Omstart av Tor"> <!ENTITY torsettings.optional "Valgfritt"> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index fcacd68..dfcd138 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor ble uventet avsluttet. +torlauncher.tor_connection_lost=Din forbindelse til Tor-nettverket har blitt brutt. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Feilet i ta kontroll over Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkobling torlauncher.recommended_bridge=(anbefalt) torlauncher.connect=Koble til +torlauncher.reconnect=Koble til på nytt torlauncher.quit=Avslutt torlauncher.quit_win=Exit torlauncher.done=Ferdig diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/nds/torlauncher.properties +++ b/src/chrome/locale/nds/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index a84a1ff..6963aa2 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=टोर सुरुवातकर्ता torlauncher.tor_exited=टोर अनपेक्षित रुपमा बन्द भयो| +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=टोरको नियेंत्रण पोर्टसंग जडान विफल भयो| torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो | torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=जडान गर्नुहोस् +torlauncher.reconnect=Reconnect torlauncher.quit=बन्द गर्नुहोस torlauncher.quit_win=बन्द torlauncher.done=भयो diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index cda2b56..5b26fc2 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Aan het wachten tot Tor gestart is..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Herstart Tor"> <!ENTITY torsettings.optional "Optioneel"> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 8483fd6..182ae3c 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Starter torlauncher.tor_exited=Tor is onverwacht afgesloten. +torlauncher.tor_connection_lost=Je verbinding met het Tor netwerk is verbroken. torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. torlauncher.tor_failed_to_start=Tor kon niet starten. torlauncher.tor_control_failed=Controle over Tor mislukt. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met h torlauncher.recommended_bridge=(aanbevolen) torlauncher.connect=Verbind +torlauncher.reconnect=Opnieuw verbinden torlauncher.quit=Stop torlauncher.quit_win=Sluit af torlauncher.done=OK diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index f46473e..a675de3 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> diff --git a/src/chrome/locale/nn/progress.dtd b/src/chrome/locale/nn/progress.dtd index ebd9cef..90fe3e6 100644 --- a/src/chrome/locale/nn/progress.dtd +++ b/src/chrome/locale/nn/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor-status"> +<!ENTITY torprogress.openSettings "Opne innstillingar"> +<!ENTITY torprogress.heading "Koplar til Tor-nettverket"> +<!ENTITY torprogress.pleaseWait "Gjer vel og vent medan me opprettar samband med Tor-nettverket."> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 0d95202..5da2bb8 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,8 +30,9 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(tilrådd) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Avslutt torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S @@ -42,7 +44,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/nso/torlauncher.properties +++ b/src/chrome/locale/nso/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/or/torlauncher.properties +++ b/src/chrome/locale/or/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 53661cb..1183cb8 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=ਕੁਨੈਕਟ ਕਰੋ +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=ਬੰਦ ਕਰੋ torlauncher.done=ਮੁਕੰਮਲ diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/pap/torlauncher.properties +++ b/src/chrome/locale/pap/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index f8cd238..9a2f3f6 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restartTor ""> +<!ENTITY torsettings.restart ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties index f124981..54c1f90 100644 --- a/src/chrome/locale/pl-PL/torlauncher.properties +++ b/src/chrome/locale/pl-PL/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 34ac2c1..b3beb8a 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Zrestartuj Tor"> <!ENTITY torsettings.optional "(opcjonalnie)"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 155ff50..367c5be 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. +torlauncher.tor_connection_lost=Twoje połączenie z siecią Tor zostało utracone. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które maj torlauncher.recommended_bridge=(zalecane) torlauncher.connect=Połącz +torlauncher.reconnect=Połącz ponownie torlauncher.quit=Wyjście torlauncher.quit_win=Wyjście torlauncher.done=Gotowe diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/pms/torlauncher.properties +++ b/src/chrome/locale/pms/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ps/torlauncher.properties +++ b/src/chrome/locale/ps/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index adb733c..254e1cc 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Configurações de Rede Tor"> +<!ENTITY torsettings.dialog.title "Configurações da Rede Tor">  -<!ENTITY torsettings.prompt "Você deve fornecer informações sobre a conexão à Internet desse computador antes de se conectar à rede Tor."> +<!ENTITY torsettings.prompt "Antes de se conectar à rede Tor, você deve fornecer informações sobre a conexão a Internet desse computador."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> @@ -12,24 +12,24 @@ <!ENTITY torSettings.configurePrompt2 "Eu preciso configurar o bridge, firewall ou opções de proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> -<!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria das situações."> +<!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyQuestion "Este computador precisa usar um proxy para acessar a Internet?">  <!ENTITY torSettings.proxyHelp "Caso você não tenha certeza sobre como responder a essa questão, consulte as configurações de rede em um outro browser para saber se ele está configurado para usar um proxy."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> -<!ENTITY torSettings.firewallQuestion "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente para certas portas?"> +<!ENTITY torSettings.firewallQuestion "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a certas portas?"> <!ENTITY torSettings.firewallHelp "Se você não tiver certeza sobre como responder a esta questão, escolha Não. Em caso de dificuldades de conexão à rede Tor, modifique esta configuração."> -<!ENTITY torSettings.enterFirewall "Insira, separando-a por vírgulas, uma lista de portas habilitadas pelo firewall. "> -<!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueiam ou censuram conexões à rede Tor?"> -<!ENTITY torSettings.bridgeHelp "Se você não está seguro de como responder esta questão, escolha No.  Se você escolher Sim, você será perguntado para configurar pontes Tor, que são relays não listados que dificultam o bloqueio a rede Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de bridges fornecido ou pode obter e digitar um personalizado."> +<!ENTITY torSettings.enterFirewall "Insira, separando-as por vírgulas, uma lista de portas habilitadas pelo firewall. "> +<!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> +<!ENTITY torSettings.bridgeHelp "Se você não estiver seguro sobre como responder a essa questão, escolha Não . Se você escolher Sim, será preciso configurar pontes Tor, que são retransmissores não-listados que dificultam possíveis bloqueios à rede Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reiniciar o Tor"> <!ENTITY torsettings.optional "Opcional"> @@ -43,22 +43,22 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente para determinadas portas."> +<!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> -<!ENTITY torsettings.useBridges.default "Conectar com os bridges fornecidos"> +<!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Digitar bridges personalizados"> +<!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira um ou mais retransmissores de pontes (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "tipo endereço:porta"> +<!ENTITY torsettings.useBridges.placeholder "tipo de endereço:porta"> -<!ENTITY torsettings.copyLog "Copiar o Log do Tor na área de transferência"> +<!ENTITY torsettings.copyLog "Copiar o registro do Tor na área de transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Se for impossível conectar-se à rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instância esteja bloqueando o Tor.  Normalmente, é possível contornar esse problema utilizando Pontes Tor, que são retransmissores ocultos, mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Você pode usar o conjunto fornecido pré-configurado de endereços de bridges ou pode obter um personalizado usando um desses três métodos:"> +<!ENTITY torsettings.bridgeHelp1 "Se for impossível conectar-se à rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instância esteja bloqueando o Tor. . Normalmente, é possível contornar esse problema utilizando Pontes Tor, que são retransmissores ocultos (não listados), mais difíceis de bloquear."> +<!ENTITY torsettings.bridgeHelp1B "Você pode usar o conjunto de endereços de pontes fornecidas, já configuradas, ou pode obter um conjunto personalizado, usando um desses três métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> -<!ENTITY torsettings.bridgeHelp2 "Use um navegador de internet e visite "> +<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Envie um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'.  Contudo, para tornar mais difícil para um invasor descobrir uma grande quantidade de endereços, você deve enviar esse pedido a partir do gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp3 "Envie um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'. . Contudo, para tornar mais difícil para um invasor descobrir uma grande quantidade de endereços de pontes, esse pedido deve ser enviado de uma conta gmail.com ou yahoo.com."> <!ENTITY torsettings.bridgeHelp4Heading "Através do "> -<!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode requisitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org.  Note que uma pessoa terá que responder a cada requisição."> +<!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org. . Note que uma pessoa terá que responder a cada solicitação"> diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd index 001fa3d..f41b13c 100644 --- a/src/chrome/locale/pt-BR/progress.dtd +++ b/src/chrome/locale/pt-BR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações "> <!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto nós estabelecemos uma conexão à rede Tor."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto nós estabelecemos uma conexão à rede Tor."> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 53942ec..fd5a15f 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -4,7 +4,8 @@ torlauncher.error_title=Inicializador do Tor torlauncher.tor_exited=Tor fechou inesperadamente. -torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor. +torlauncher.tor_connection_lost=Sua conexão à rede Tor foi interrompida. +torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle do Tor. torlauncher.tor_failed_to_start=Falha ao iniciar Tor. torlauncher.tor_control_failed=Falha ao receber controle do Tor. torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor. @@ -24,26 +25,27 @@ torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou u torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. -torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste suas configurações. +torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar +torlauncher.reconnect=Reconectar torlauncher.quit=Encerrar torlauncher.quit_win=Sair torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte -torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de servidores +torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade -torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informações de servidor +torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informações do retransmissor torlauncher.bootstrapStatus.loading_descriptors=Carregando informações de servidor torlauncher.bootstrapStatus.conn_or=Conectando à rede Tor -torlauncher.bootstrapStatus.handshake_or=Estabelecendo circuito Tor +torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor torlauncher.bootstrapStatus.done=Conectado à rede Tor! torlauncher.bootstrapWarning.done=pronto diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 2b47fd3..1f5566e 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "À espera que o Tor inicie..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reiniciar o Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 286c759..94a233f 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. +torlauncher.tor_connection_lost=A sua ligação à rede Tor perdeu-se. torlauncher.tor_controlconn_failed=Não foi possível ligar ao porto de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. torlauncher.tor_control_failed=Falha ao tentar controlar o Tor @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Não há pontes disponíveis que tenha torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Ligar +torlauncher.reconnect=Voltar a ligar torlauncher.quit=Sair torlauncher.quit_win=Sair torlauncher.done=Completo diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 64de5c5..b2c90ff 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -1,64 +1,64 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Setări rețea Tor">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Înainte de a vă conecta la rețeaua Tor, trebuie să oferiți informații despre conexiunea acestui computer la Internet."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Nu"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> +<!ENTITY torSettings.configurePrompt1 "Conexiunea acestui computer la Internet este cenzurată, filtrată sau cu proxy."> +<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez punte, firewall sau proxy."> +<!ENTITY torSettings.configure "Configuraţi "> +<!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reţeaua Tor ."> +<!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Computerul dumneavoastră are nevoie de un proxy sa acceseze Internet-ul ?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Dacă nu sînteți siguri cum să răspundeți la întrebarea aceasta, uitați-vă la setările de Internet din alt browser pentru a vedea dacă este configurat să folosească un proxy."> +<!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> +<!ENTITY torSettings.firewallQuestion "Conexiunea la Internet a acestui computer iese printr-un firewall care permite doar conexiuni către anumite porturi?"> +<!ENTITY torSettings.firewallHelp "Dacă nu sînteți sigur cum să răspundeți la această întrebare, alegeți Nu. Dacă întîlniți probleme conectîndu-vă la rețeaua Tor, schimbați aceste setări."> +<!ENTITY torSettings.enterFirewall "Introduceți o listă separată cu virgule de porturi care sînt permise de firewall."> +<!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?"> +<!ENTITY torSettings.bridgeHelp "Dacă nu sînteți sigur cum să răspundeți la această întrebare, alegeți Nu.  Dacă alegeți Da, vi se va cere să configurați punțile Tor, care sînt relayuri nelistate care fac mai dificilă blocarea conexiunilor la rețeaua Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Puteți folosi setul de punți oferit sau puteți obține și introduce un set particular de punți.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Aștept Tor să pornească..."> +<!ENTITY torsettings.restartTor "Repornește Tor"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opțional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Acest computer are nevoie să folosească un proxy pentru a accesa Internetul"> +<!ENTITY torsettings.useProxy.type "Tip proxy:"> <!ENTITY torsettings.useProxy.address "Adresă:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Nume utilizator:"> <!ENTITY torsettings.useProxy.password "Parola:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Acest computer iese printr-un firewall care permite doar conexiuni către anumite porturi"> <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Internet Service Providerul (ISP) meu blochează conexiunile către rețeaua Tor"> +<!ENTITY torsettings.useBridges.default "Conectați-vă punțile oferite"> +<!ENTITY torsettings.useBridges.type "Tip de transport:"> +<!ENTITY torsettings.useBridges.custom "Introduceți punți personalizate"> +<!ENTITY torsettings.useBridges.label "Introduceți una sau mai multe bridge relays (una pe linie)."> +<!ENTITY torsettings.useBridges.placeholder "scrieți adresă:port"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.copyLog "Copiați jurnalul Tor în Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay"> +<!ENTITY torsettings.bridgeHelp1 "Dacă nu puteți să vă conectați la rețeaua tor, poate să fie din cauză că Internet Service Providerul (ISP) sau altă agenție blochează Tor.  Des, puteți ocoli această problemă folosind Tor Bridges, care sînt relayuri nelistate, mai dificil de blocat."> +<!ENTITY torsettings.bridgeHelp1B "Puteți folosi setul de adrese de punți preconfigurate oferite sau puteți obține un set personalizat de adrese folosind una din aceste trei metode:"> +<!ENTITY torsettings.bridgeHelp2Heading "Prin Web"> +<!ENTITY torsettings.bridgeHelp2 "Folosiți un webbrowser pentru a vizita https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Prin email automat"> +<!ENTITY torsettings.bridgeHelp3 "Trimiteți email la bridges(a)torproject.org cu 'get bridges' singură în corpul mesajului.  Oricum, pentru a face mai greu pentru un atacator să afle multe adrese de punți, trebuie să trimiteți această cerere de la o adresă gmail.com sau yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd index 9a1a989..f81f1b2 100644 --- a/src/chrome/locale/ro/progress.dtd +++ b/src/chrome/locale/ro/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stare Tor"> <!ENTITY torprogress.openSettings "Setări"> <!ENTITY torprogress.heading "Conctare la reţeaua Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Așteptați pînă stabilim o conexiune la rețeaua Tor."> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 8fa13e4..adec424 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -4,31 +4,33 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited=Tor a ieșit în mod neașteptat. +torlauncher.tor_connection_lost=Conexiunea to cu rețeaua Tor s-a pierdut. torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. torlauncher.tor_failed_to_start=Tor nu poate porni. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Eșec să preiau controlul Tor. +torlauncher.tor_bootstrap_failed=Tor nu a reușit să facă o conexiune la rețeaua Tor. +torlauncher.tor_bootstrap_failed_details=%1$S eșec (%2$S). torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fișierul torrc lipsește -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.datadir_missing=Tor data directory nu există. +torlauncher.password_hash_missing=Eșec parole hashed. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S +torlauncher.failed_to_save_settings=Nu pot salva Tor settings.\n\n%S torlauncher.ensure_tor_is_running=Vă rugăm asigurați-vă că Tor este pornit. torlauncher.error_proxy_addr_missing=Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie să specificaţi atât o adresă de IP, cât şi un port. torlauncher.error_proxy_type_missing=Trebuie să selectezi un tip de proxy. torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Trebuie să alegeți un tip de transport pentru punțile oferite +torlauncher.error_bridge_bad_default_type=Nici una din punțile oferite care să ofere transport tip %S este disponibilă. Ajutați setările. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recomandat) torlauncher.connect=Conectare +torlauncher.reconnect=Reconectează torlauncher.quit=Revocare torlauncher.quit_win=Ieşire torlauncher.done=Gata @@ -54,4 +56,4 @@ torlauncher.bootstrapWarning.identity=identităţile nu se potrivesc torlauncher.bootstrapWarning.timeout=timpul alocat pentru conexiune a expirat (timeout) torlauncher.bootstrapWarning.noroute=nici o rută către gazdă torlauncher.bootstrapWarning.ioerror=eroare la scriere/citire -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=pluggable transport lipsă diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index bf9debe..ba61f55 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Загрузчик Tor torlauncher.tor_exited=Tor неожиданно завершился. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. torlauncher.tor_control_failed=Не удалось взять контроль над Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Предопределенные мо torlauncher.recommended_bridge=(рекомендуемый) torlauncher.connect=Соединиться +torlauncher.reconnect=Reconnect torlauncher.quit=Выйти torlauncher.quit_win=Выход torlauncher.done=Готово diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties index b6b7bd4..fb8d310 100644 --- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties +++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -26,9 +27,10 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(рекомендуется) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/sco/torlauncher.properties +++ b/src/chrome/locale/sco/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties index a1f666a..9884689 100644 --- a/src/chrome/locale/si-LK/torlauncher.properties +++ b/src/chrome/locale/si-LK/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor පුරනය torlauncher.tor_exited=Tor අනපේක්ෂිත ලෙස නැතිවිය. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Tor පාලක පොර්ටයට සම්බන්ධ විය නොහැක. torlauncher.tor_failed_to_start=Tor ආරම්භ කිරීමට අපොහොසත්ය. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=සම්බන්ධ වෙන්න +torlauncher.reconnect=Reconnect torlauncher.quit=ඉවත් වෙන්න torlauncher.quit_win=අයින් වන්න torlauncher.done=කරන ලදී diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index ce39661..b5d9fe5 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,42 +1,42 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Nastavenia Tor Network">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Pred tým, než sa pripojíte k sieti Tor, je potrebné poskytnúť informácie o pripojení tohto počítača na Internet."> <!ENTITY torSettings.yes "Áno"> <!ENTITY torSettings.no "Nie"> -<!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje Vašu?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje vašu?"> +<!ENTITY torSettings.configurePrompt1 "Pripojenie tohto počítača je cenzurované, filtrované alebo vedené cez proxy."> +<!ENTITY torSettings.configurePrompt2 "Potrebujem nastaviť premostenie, firewall alebo proxy."> <!ENTITY torSettings.configure "Konfigurovať"> <!ENTITY torSettings.connectPrompt2 "Rád by som sa pripojil priamo do siete Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Toto by vo väčšine prípadov malo fungovať."> <!ENTITY torSettings.connect "Pripojiť"> <!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač použiť proxy pre prístup na internet?">  -<!ENTITY torSettings.proxyHelp "Ak si nie ste istý odpoveďou na túto otázku, pozrite na nastavenie internetu v inom prehliadači, či je konfigurovaný pre použitie proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> +<!ENTITY torSettings.proxyHelp "Ak si nie ste istý odpoveďou na túto otázku, skontrolujte nastavenia Internetu v inom prehliadači, aby ste zistili, či je nastavený pre použitie proxy."> +<!ENTITY torSettings.enterProxy "Zadajte nastavenia proxy."> +<!ENTITY torSettings.firewallQuestion "Je pripojenie tohto počítača na Internet vedené cez firewall, ktorý povoľuje spojenia len na určité porty?"> +<!ENTITY torSettings.firewallHelp "Ak neviete, ako máte odpovedať na túto otázku, zvoľte Nie. Ak sa vyskytne problém s pripojením do siete Tor, zmeňte toto nastavenie."> <!ENTITY torSettings.enterFirewall "Zadajte čísla portov oddelené medzerou, ktoré sú povolené na firewalle."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Blokuje váš poskytovateľ internetového pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?"> +<!ENTITY torSettings.bridgeHelp "Ak si nie ste istí, ako odpovedať, zvoľte Nie.  Ak zvolíte Áno, bude potrebné nakonfigurovať Tor Bridges, čo sú nikde nezapísané relé, použitie ktorých robí blokovanie pripojenia do Tor Network ešte obtiažnejším."> +<!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť dodanú sadu premostení alebo si môžete zaobstarať a zadať vlastnú sadu premostení.">  <!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reštartovať Tor"> -<!ENTITY torsettings.optional "Voliteľne"> +<!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje použiť proxy pre prístup na internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje pre prístup na Internet použiť proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Užívateľské meno:"> <!ENTITY torsettings.useProxy.password "Heslo:"> @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Zadaj jeden alebo viac premosťovacích relays (jednu na riadok)."> +<!ENTITY torsettings.useBridges.default "Pripojiť sa cez dodané premostenia"> +<!ENTITY torsettings.useBridges.type "Typ transportu:"> +<!ENTITY torsettings.useBridges.custom "Zadajte vlastné premostenia"> +<!ENTITY torsettings.useBridges.label "Zadaj jedno alebo viac premostení relé (jedno na riadok)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelpTitle "Pomocník pre premostenia relé"> +<!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopní sa pripojiť do siete Tor, je možné, že váš poskytovateľ internetového pripojenia (ISP) alebo iný správny orgán blokuje Tor.  Väčšinou je možné tento problém obísť použitím Tor Bridges, čo sú nikde nezapísané relé, ktoré je obtiažne blokovať."> +<!ENTITY torsettings.bridgeHelp1B "Môžete použiť prednastavenú, dodanú sadu adries premostenia alebo si môžete zaobstarať vlastnú sadu adries pomocou jedného z troch nasledujúcich spôsobov:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Navštívte https://bridges.torproject.org pomocou webového prehliadača"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Odošlite e-mail na bridges(a)torproject.org, ktorý v správe na samostatnom riadku obsahuje 'get bridges'.  Aby však bolo získanie adries premostenia pre útočníka ťažšie, musíte vašu požiadavku poslať z e-mailovej adresa na gmail.com alebo yahoo.com."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> diff --git a/src/chrome/locale/sk-SK/progress.dtd b/src/chrome/locale/sk-SK/progress.dtd index ebd9cef..1069086 100644 --- a/src/chrome/locale/sk-SK/progress.dtd +++ b/src/chrome/locale/sk-SK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Pripájanie do siete Tor "> +<!ENTITY torprogress.pleaseWait "Čakajte, prosím, kým sa vytvorí spojenie do siete Tor."> diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index 1f133d6..d588f70 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -4,10 +4,11 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor sa nečakane vypol. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor nedokázal nadviazať spojenie do siete Tor. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S @@ -29,8 +30,9 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Pripojiť +torlauncher.reconnect=Reconnect torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=For assistance, contact %S @@ -42,9 +44,9 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.done=Pripojené do siete Tor! torlauncher.bootstrapWarning.done=done torlauncher.bootstrapWarning.connectrefused=connection refused diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index b016276..3bbcfcf 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Spúšťač Tor torlauncher.tor_exited=Tor bol neočakávane ukončený. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_control_failed=Nepodarilo sa prevziať kontrolu nad Torom. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Žiadne poskytnuté mosty nemajú dost torlauncher.recommended_bridge=(odporúčané) torlauncher.connect=Pripojiť +torlauncher.reconnect=Reconnect torlauncher.quit=Ukončiť torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index 82a1cbd..11d70c8 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor zaganjalnik torlauncher.tor_exited=Tor je se je nepredvideno zaustavil. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Povezava na Tor nadzorna vrata ni uspela. torlauncher.tor_failed_to_start=Tor se ni zagnal. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Poveži +torlauncher.reconnect=Reconnect torlauncher.quit=Zapusti torlauncher.quit_win=Izhod torlauncher.done=Končano diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties index d5fd4d3..3d2d4e7 100644 --- a/src/chrome/locale/sn/torlauncher.properties +++ b/src/chrome/locale/sn/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Buda torlauncher.done=Done diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/so/torlauncher.properties +++ b/src/chrome/locale/so/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/son/torlauncher.properties +++ b/src/chrome/locale/son/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties index 6457d6b..a2550db 100644 --- a/src/chrome/locale/sq-AL/torlauncher.properties +++ b/src/chrome/locale/sq-AL/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd index c25eb19..b127352 100644 --- a/src/chrome/locale/sq/progress.dtd +++ b/src/chrome/locale/sq/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Gjendja e Tor"> +<!ENTITY torprogress.dialog.title "Statusi i Tor"> <!ENTITY torprogress.openSettings "Hap parametrat"> -<!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Ju lutem prisni sa të vendoset nje lidhje me rrjetin Tor"> +<!ENTITY torprogress.heading "Duke u lidhur me rrjetin e Tor"> +<!ENTITY torprogress.pleaseWait "Ju lutem prisni deri sa të vendoset nje lidhje me rrjetin e Tor"> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index 26bbbb0..1c0489b 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Lidhu +torlauncher.reconnect=Reconnect torlauncher.quit=Dil torlauncher.quit_win=Dil torlauncher.done=Done diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 45a74cd..b01fedf 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Повежи се"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  diff --git a/src/chrome/locale/sr/progress.dtd b/src/chrome/locale/sr/progress.dtd index 4d72b08..5e5f506 100644 --- a/src/chrome/locale/sr/progress.dtd +++ b/src/chrome/locale/sr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Тор статус"> <!ENTITY torprogress.openSettings "Отвори подешавања"> <!ENTITY torprogress.heading "Повезивање на Тор мрежу"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Молимо вас сачекајте док успоставимо везу са Тор мрежом"> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index 2edd6f0..f7eef46 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -1,39 +1,41 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.error_title=Тоr Покретач + +torlauncher.tor_exited=Tor се неочекивано искључио +torlauncher.tor_connection_lost=Ваша веза са Tor мрежом је изгубљена +torlauncher.tor_controlconn_failed=Повезивање на Tor port није успело +torlauncher.tor_failed_to_start=Tor није успео да се покрене +torlauncher.tor_control_failed=Неуспело преузимање контроле над Tor-om +torlauncher.tor_bootstrap_failed=Tor није успео да се повеже на Tor мрежу torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Тоr се не може покренути\n\n%Ѕ +torlauncher.tor_missing=Tor извршни фајл недостаје +torlauncher.torrc_missing=torrc фајл недостаје +torlauncher.datadir_missing=Директоријум за Тоr податке не постоји +torlauncher.password_hash_missing=Узимање хеширане лозинке није успело -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Немогућност повратка Tor подешавања\n\n%Ѕ +torlauncher.failed_to_save_settings=Немогућност чувања Tor подешавања +torlauncher.ensure_tor_is_running=Уверите се да Tor ради torlauncher.error_proxy_addr_missing=Морате навести IP адресу или име и порт да би подесили Tor да користи прокси на интернету. torlauncher.error_proxy_type_missing=Morate izabrati tip proxya. torlauncher.error_bridges_missing=Morate odrediti jedan ili vise mostova -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Морате да одаберете тип транспорта за обезбеђене мостове torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(препоручено) -torlauncher.connect=Connect +torlauncher.connect=Повежи се +torlauncher.reconnect=Поново се повежи torlauncher.quit=Искључити torlauncher.quit_win=Излаз torlauncher.done=Gotovo -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=За помоћ контактирајте %Ѕ torlauncher.bootstrapStatus.conn_dir=Повезивање са релеј директоријумом torlauncher.bootstrapStatus.handshake_dir=Успостављање шифроване везе директоријума diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/st/torlauncher.properties +++ b/src/chrome/locale/st/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/su/torlauncher.properties +++ b/src/chrome/locale/su/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index dadbdda..6ce1473 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restartTor ""> +<!ENTITY torsettings.restart ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties index 0e49bc8..fcd4d83 100644 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ b/src/chrome/locale/sv-SE/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 513810e..9397a1e 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor stängdes av oväntat. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade brygg torlauncher.recommended_bridge=(rekommenderas) torlauncher.connect=Anslut +torlauncher.reconnect=Reconnect torlauncher.quit=Avsluta torlauncher.quit_win=Stäng torlauncher.done=Klar diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/szl/torlauncher.properties +++ b/src/chrome/locale/szl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index 39ced49..299f992 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor துவக்கி torlauncher.tor_exited=Tor எதிர்பாராத விதமாக வெளியேறிவிட்டது. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Tor கட்டுப்பாட்டு துறையை இணைக்க முடியவில்லை. torlauncher.tor_failed_to_start=Tor தொடங்க முடியவில்லை. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=இணைக்க +torlauncher.reconnect=Reconnect torlauncher.quit=விடுவி torlauncher.quit_win=வெளியேறு torlauncher.done=முடிந்தது diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/te-IN/torlauncher.properties +++ b/src/chrome/locale/te-IN/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index bd38765..3691169 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=ตัวเปิด Tor torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไม่คาดคิด +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้ torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=เชื่อมต่อ +torlauncher.reconnect=Reconnect torlauncher.quit=ออก torlauncher.quit_win=ออก torlauncher.done=สำเร็จ diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/tk/torlauncher.properties +++ b/src/chrome/locale/tk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 9fc4a88..8718c38 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Başlatıcı torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı. torlauncher.tor_failed_to_start=Tor başlatılamadı. torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kul torlauncher.recommended_bridge=(önerilen) torlauncher.connect=Bağlan +torlauncher.reconnect=Reconnect torlauncher.quit=Çık torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 239fd7b..05891cd 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Завантажувач Tor torlauncher.tor_exited=Tor несподівано завершився. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Неможливо з'єднатися з портом управління Tor. torlauncher.tor_failed_to_start=Tor не зміг запуститися. torlauncher.tor_control_failed=Збій отримання контролю над Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Немає мережевих мост torlauncher.recommended_bridge=(рекомендовано) torlauncher.connect=З'єднатися +torlauncher.reconnect=Reconnect torlauncher.quit=Вийти torlauncher.quit_win=Вихід torlauncher.done=Готово diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index 6c91b1e..b4ba9ca 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=چھوڑدیجیے (Quit) torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 667ec18..57dcb32 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor ishga tushirish muvaffaqiyatsiz tugadi. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Ulanish +torlauncher.reconnect=Reconnect torlauncher.quit=Chiqish torlauncher.quit_win=Chiqish torlauncher.done=Bajarildi diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/ve/torlauncher.properties +++ b/src/chrome/locale/ve/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 5247f60..d565c82 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(khuyên dùng) torlauncher.connect=Kết nối +torlauncher.reconnect=Reconnect torlauncher.quit=Thoát torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/wa/torlauncher.properties +++ b/src/chrome/locale/wa/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/wo/torlauncher.properties +++ b/src/chrome/locale/wo/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties index 0157189..d82d688 100644 --- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties +++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 56cfaff..db96aef 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "重新启动 Tor"> <!ENTITY torsettings.optional "可选"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 5c4a321..cd7ede8 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor 启动器 torlauncher.tor_exited=Tor 意外退出。 +torlauncher.tor_connection_lost=您到 Tor 网络的连接已丢失。 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 torlauncher.tor_control_failed=控制 Tor 失败。 @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=没有提供传输类型为 %S 的可 torlauncher.recommended_bridge=(推荐) torlauncher.connect=连接 +torlauncher.reconnect=重新连接 torlauncher.quit=退出 torlauncher.quit_win=关闭 torlauncher.done=完成 diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 2a0fcd8..71d997d 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor啟動器 torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(建議) torlauncher.connect=連接 +torlauncher.reconnect=Reconnect torlauncher.quit=離開 torlauncher.quit_win=離開 torlauncher.done=完成 diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 3b7e359..e1af290 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -2,63 +2,63 @@  -<!ENTITY torsettings.prompt "當您連接到 Tor 網路之前，您必須提供關於這部電腦的網路連線資訊"> +<!ENTITY torsettings.prompt "在您連接到 Tor 網路前，您需要提供這台電腦網路連線的相關資訊"> -<!ENTITY torSettings.yes "確定"> -<!ENTITY torSettings.no "取消"> +<!ENTITY torSettings.yes "是"> +<!ENTITY torSettings.no "否"> -<!ENTITY torSettings.firstQuestion "下列哪一項最符合您的情況？"> -<!ENTITY torSettings.configurePrompt1 "此電腦的網路連結被審查、過濾、或經過代理。"> +<!ENTITY torSettings.firstQuestion "下列哪一項最符合您的情況?"> +<!ENTITY torSettings.configurePrompt1 "這台電腦的網際網路連線遭審查、過濾、或經過代理。"> <!ENTITY torSettings.configurePrompt2 "我需要設定橋接、防火牆或代理伺服器設定。"> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "我想直接連結到 Tor 網路。"> -<!ENTITY torSettings.connectPrompt3 "這能在大部分狀況中生效"> -<!ENTITY torSettings.connect "連結"> +<!ENTITY torSettings.connectPrompt2 "我想直接連接到 Tor 網路。"> +<!ENTITY torSettings.connectPrompt3 "這將在大多數情況下生效。"> +<!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyQuestion "這台電腦是否需要透過代理伺服器存取網際網路？"> +<!ENTITY torSettings.proxyQuestion "這台電腦需要使用代理伺服器來存取網際網路嗎?">  -<!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，請查看其他瀏覽器的網路設定，看它是否設定為透過代理伺服器連線。"> +<!ENTITY torSettings.proxyHelp "若您不確定如何回答此問題，請查看其他瀏覽器的網際網路設定，看看它是否設定成使用代理伺服器連線。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> -<!ENTITY torSettings.firewallQuestion "此電腦的網路連線，是否通過只允許連結特定連線埠的防火牆？"> -<!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題，請選擇「否」。若您在連結至 Tor 網路時遭遇問題，請再改變此設定。"> +<!ENTITY torSettings.firewallQuestion "這台電腦的網際網路連線，要通過只允許連接特定連線埠的防火牆嗎?"> +<!ENTITY torSettings.firewallHelp "若您不確定如何回答此問題，請選擇「否」。若您連接至 Tor 網路時遭遇問題，請變更此設定。"> <!ENTITY torSettings.enterFirewall "請輸入防火牆允許的連線埠（請以逗號分隔）。"> -<!ENTITY torSettings.bridgeQuestion "您的網路供應商 (ISP) 阻擋或者審查 Tor 網路連線？"> -<!ENTITY torSettings.bridgeHelp "如果你不知道如何回答這個問題，請選擇「否」  如果你選擇選擇「是」，你將被要求設定Tor網橋，這可以讓阻擋客戶端與Tor伺服器的連接更困難。"> -<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用預設的網橋或者你可以使用自定義設置的網橋。"> +<!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)阻擋或審查員連接到 Tor 網路?"> +<!ENTITY torSettings.bridgeHelp "如果您不確定如何回答此問題，請選擇「否」。  如果您選擇「是」，您將被要求設定Tor 橋接，這讓阻止連接到 Tor 網路更加困難。"> +<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接或您可以輸入一組自訂的橋接。">  <!ENTITY torsettings.startingTor "正在等待 Tor 啟動…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "重新啟動 Tor"> -<!ENTITY torsettings.optional "選項"> +<!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理伺服器存取網際網路"> +<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理伺服器來存取網際網路"> <!ENTITY torsettings.useProxy.type "代理伺服器類型:"> -<!ENTITY torsettings.useProxy.address "地址:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名"> +<!ENTITY torsettings.useProxy.address "位址:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱"> <!ENTITY torsettings.useProxy.port "連接埠:"> -<!ENTITY torsettings.useProxy.username "用戶名:"> +<!ENTITY torsettings.useProxy.username "使用者名稱:"> <!ENTITY torsettings.useProxy.password "密碼:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "這台電腦通過只允許連結至特定連線埠的防火牆"> +<!ENTITY torsettings.firewall.checkbox "這台電腦通過只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠:"> -<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)封鎖連結到Tor網絡"> -<!ENTITY torsettings.useBridges.default "連線並提供網橋"> -<!ENTITY torsettings.useBridges.type "連線類型："> -<!ENTITY torsettings.useBridges.custom "進入客製化網橋"> +<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)阻止連接至 Tor 網路"> +<!ENTITY torsettings.useBridges.default "使用提供的橋接連線"> +<!ENTITY torsettings.useBridges.type "傳輸類型:"> +<!ENTITY torsettings.useBridges.custom "輸入自訂橋接"> <!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼 (每行一個)。"> -<!ENTITY torsettings.useBridges.placeholder "類型 address:port"> +<!ENTITY torsettings.useBridges.placeholder "輸入位址:連接埠"> -<!ENTITY torsettings.copyLog "複製 Tor 記錄到剪貼簿"> +<!ENTITY torsettings.copyLog "將 Tor 記錄複製到剪貼簿"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼說明"> -<!ENTITY torsettings.bridgeHelp1 "若您無法連接到 Tor 網路，可能是您的網際網路服務提供者 (ISP) 或其他機構已封鎖 Tor。  通常你可以使用更難以封鎖之隱藏中繼的 Tor 橋接來解決問題。"> -<!ENTITY torsettings.bridgeHelp1B "你可能會使用預設，提供網橋地址或是你可能使用一個客製化的地址選擇由以下三者之中選一："> +<!ENTITY torsettings.bridgeHelp1 "若您無法連接到 Tor 網路，可能是您的網際網路服務提供者 (ISP) 或其他機構已封鎖 Tor。  通常您可以使用更難以封鎖之隱藏中繼的 Tor 橋接來解決此問題。"> +<!ENTITY torsettings.bridgeHelp1B "您可以使用預先設定，提供橋接位址或您可以使用下列三種方法其中之一獲取一組自訂的位址:"> <!ENTITY torsettings.bridgeHelp2Heading "透過網路"> <!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "透過 Email 自動回覆"> -<!ENTITY torsettings.bridgeHelp3 "尋找公眾橋接位址的另一種方式是發送郵件到 bridges(a)torproject.xn--org,-3e5fnb965bxtdv9cqulkw6b 「get bridges」訊息。  然而，為了使攻擊者更難紀錄到更多橋接位址，您必須使用 gmail.com 或 yahoo.com 的信箱來發送此郵件。"> -<!ENTITY torsettings.bridgeHelp4Heading "透過 Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "最後的方法是：你可以寄送一封有禮貌的郵件到 help(a)rt.torproject.org   請注意我們需要一封封的手動回覆郵件。"> +<!ENTITY torsettings.bridgeHelp3Heading "透過電子郵件自動回覆"> +<!ENTITY torsettings.bridgeHelp3 "尋找公眾橋接位址的另一種方式是發送電子郵件到 bridges(a)torproject.xn--org,-3e5fnb965bxtdv9cqulkw6b 「get bridges」訊息。  然而，為了使攻擊者更難記錄到更多橋接位址，您必須使用 gmail.com 或 yahoo.com 的信箱來發送此郵件。"> +<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> +<!ENTITY torsettings.bridgeHelp4 "最後的方法是:您可以發送一封正常的郵件到 help(a)rt.torproject.org.  請注意我們需要一封封的手動回覆郵件。"> diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd index fe88399..be27a6b 100644 --- a/src/chrome/locale/zh-TW/progress.dtd +++ b/src/chrome/locale/zh-TW/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 狀態"> <!ENTITY torprogress.openSettings "開啟設定"> <!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "我們正在建立 Tor 網路連線，請稍候"> +<!ENTITY torprogress.pleaseWait "我們正在建立 Tor 網路連線，請稍候..."> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index a320633..78d59a3 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -1,57 +1,59 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor 啟動程式 - -torlauncher.tor_exited=Tor 未預期的關閉。 -torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。 -torlauncher.tor_failed_to_start=Tor 啟動失敗 -torlauncher.tor_control_failed=無法控制 Tor. -torlauncher.tor_bootstrap_failed=建立 Tor 網絡連結失敗。 +torlauncher.error_title=Tor 啟動工具 + +torlauncher.tor_exited=Tor 意外結束。 +torlauncher.tor_connection_lost=您與 Tor 網路的連線已遺失。 +torlauncher.tor_controlconn_failed=無法連接至 Tor 控制連接埠。 +torlauncher.tor_failed_to_start=Tor 無法啟動。 +torlauncher.tor_control_failed=無法控制 Tor。 +torlauncher.tor_bootstrap_failed=Tor 無法建立 Tor 網路連線。 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 -torlauncher.unable_to_start_tor=無法啟動Tor。\n\n%S -torlauncher.tor_missing=Tor 執行檔已遺失。 -torlauncher.torrc_missing=torrc 檔案已遺失。 -torlauncher.datadir_missing=Tor 檔案資料夾不存在。 +torlauncher.unable_to_start_tor=無法啟動 Tor。\n\n%S +torlauncher.tor_missing=Tor 可執行檔遺失。 +torlauncher.torrc_missing=torrc 檔案遺失。 +torlauncher.datadir_missing=Tor 資料目錄不存在。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 -torlauncher.failed_to_get_settings=無法擷取 Tor 設定值。\n\n%S -torlauncher.failed_to_save_settings=無法儲存 Tor 的設定值。\n\n%S +torlauncher.failed_to_get_settings=無法擷取 Tor 設定。\n\n%S +torlauncher.failed_to_save_settings=無法儲存 Tor 的設定。\n\n%S torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。 -torlauncher.error_proxy_addr_missing=想要設定 Tor 透過 Proxy 存取網路，您必須指定一個 IP 位置或主機名稱、以及連接埠號碼。 +torlauncher.error_proxy_addr_missing=想要設定 Tor 使用代理伺服器來存取網路，您必須指定一個 IP 位址或主機名稱以及連接埠號碼。 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 -torlauncher.error_bridges_missing=您必須指定一或多個橋接。 -torlauncher.error_default_bridges_type_missing=你必須選擇一種傳送方式才能提供網橋 -torlauncher.error_bridge_bad_default_type=沒有可用的連線方式為 %S 的網橋。請調整您的設定。 +torlauncher.error_bridges_missing=您必須指定一個或多個橋接。 +torlauncher.error_default_bridges_type_missing=您必須選擇一種傳輸類型才能提供橋接。 +torlauncher.error_bridge_bad_default_type=沒有可用的傳輸類型為 %S 的橋接。請調整您的設定。 -torlauncher.recommended_bridge=(建議) +torlauncher.recommended_bridge=(建議使用) torlauncher.connect=連接 +torlauncher.reconnect=重新連線 torlauncher.quit=離開 torlauncher.quit_win=結束 torlauncher.done=完成 torlauncher.forAssistance=如需協助，請聯絡 %S -torlauncher.bootstrapStatus.conn_dir=正連線至中繼站目錄 +torlauncher.bootstrapStatus.conn_dir=正連接至中繼目錄 torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目錄連線 -torlauncher.bootstrapStatus.requesting_status=接收網路狀態 +torlauncher.bootstrapStatus.requesting_status=正在擷取網路狀態 torlauncher.bootstrapStatus.loading_status=正在載入網路狀態 -torlauncher.bootstrapStatus.loading_keys=正在載入憑證機構證書 -torlauncher.bootstrapStatus.requesting_descriptors=正在要求中繼站資訊 +torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證 +torlauncher.bootstrapStatus.requesting_descriptors=正在要求中繼資訊 torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼資訊 -torlauncher.bootstrapStatus.conn_or=正在連線至 Tor 網路 +torlauncher.bootstrapStatus.conn_or=正連接至 Tor 網路 torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 迴路 -torlauncher.bootstrapStatus.done=已連線到 Tor 網路！ +torlauncher.bootstrapStatus.done=已連接到 Tor 網路! torlauncher.bootstrapWarning.done=完成 -torlauncher.bootstrapWarning.connectrefused=連線被拒絕 +torlauncher.bootstrapWarning.connectrefused=連線遭拒 torlauncher.bootstrapWarning.misc=雜項 torlauncher.bootstrapWarning.resourcelimit=資源不足 -torlauncher.bootstrapWarning.identity=身分不一致 +torlauncher.bootstrapWarning.identity=識別不符 torlauncher.bootstrapWarning.timeout=連線逾時 -torlauncher.bootstrapWarning.noroute=無連結至 host 的路徑 -torlauncher.bootstrapWarning.ioerror=讀寫錯誤 -torlauncher.bootstrapWarning.pt_missing=缺少可插拔傳輸 +torlauncher.bootstrapWarning.noroute=沒有到主機的路由 +torlauncher.bootstrapWarning.ioerror=讀取/寫入錯誤 +torlauncher.bootstrapWarning.pt_missing=缺少可插式傳輸 diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties index 0157189..d82d688 100644 --- a/src/chrome/locale/zh/torlauncher.properties +++ b/src/chrome/locale/zh/torlauncher.properties @@ -4,6 +4,7 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties index b6b7bd4..bf2426a 100644 --- a/src/chrome/locale/zu/torlauncher.properties +++ b/src/chrome/locale/zu/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -29,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done

1 0

[tor-launcher/master] Bump version for 0.2.6.2.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 55e4b89f5f62f746189d5290bbd7075a402c3322 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:59:53 2014 -0700 Bump version for 0.2.6.2. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a1b5d98..ec1377d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.6.1</em:version> + <em:version>0.2.6.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Update versions file and changelog for Torbutton 1.6.12.0.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit ecb0e43556dfa0ca607ebdbe9902167d794b220d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:45:21 2014 -0700 Update versions file and changelog for Torbutton 1.6.12.0. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4b4a1a2..bd80adb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,12 +6,13 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 5.0development.0 - * Update Torbutton to 1.6.11.1 + * Update Torbutton to 1.6.12.0 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. * Bug 12680: Change Torbutton URL in about dialog. * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 9531: Workaround to avoid rare hangs during New Identity * Update Tor Launcher to 0.2.6.1 * Bug 11199: Improve behavior if tor exits * Bug 12451: Add option to hide TBB's logo diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8f558d7..1911175 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.6-alpha TORLAUNCHER_TAG=0.2.6.1 -TORBUTTON_TAG=1.6.11.1 +TORBUTTON_TAG=1.6.12.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Update changelog for meek.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 176e3bc6e451bb6f515ef657977c2eaa64f19bb3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:50:28 2014 -0700 Update changelog for meek. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index bd80adb..7b92997 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * All Platforms - * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) + * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) + * Two modes of Meek are provided: Meek over Google and Meek over Amazon * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33

1 0

[tor-browser-bundle/master] Add an option to use meek through CloudFront.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit f9b9e2420072dff2b49ef45b8fa4e0aae1ff59ae Author: David Fifield <david(a)bamsoftware.com> Date: Sat Aug 2 08:27:39 2014 +0000 Add an option to use meek through CloudFront. I don't know the best way to handle this in the UI. I added two transports, meek-google and meek-amazon, that will appear in the selection menu. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9807302..b04e84e 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -29,4 +29,5 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.4 pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); +pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Move url and front from torrc to bridge_prefs.js.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 4b492d319e2bbe0f1bde3bf6334c8fdc088c4469 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Aug 4 19:46:50 2014 -0700 Move url and front from torrc to bridge_prefs.js. The alpha release uses tor 0.2.5, which can take these parameters on the Bridge line so they don't have to be part of the ClientTransportPlugin command. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index b01ad07..9807302 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -29,4 +29,4 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.4 pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1"); +pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 24f35ff..d019d19 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -11,4 +11,4 @@ ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./TorBrowser/Tor/PluggableTr ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com +ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index a4c3499..d6ec189 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,scramblesuit exec PluggableTransports/obfsprox ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com +ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 5c35ebb..f1b103d 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,scramblesuit exec TorBrowser\Tor\PluggableTran ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client

1 0

[torbutton/master] Update translations for 1.6.12.0.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit b6e98c0513a931ef330d1d4a818beb14b829e7b3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:40:41 2014 -0700 Update translations for 1.6.12.0. --- src/chrome/locale/de/torbutton.dtd | 24 ++++++++++++------------ src/chrome/locale/es/torbutton.dtd | 6 +++--- src/chrome/locale/pt/aboutTor.dtd | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 9b90090..6242e22 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -27,21 +27,21 @@ <!ENTITY torbutton.context_menu.toggle "Tor-Modus umschalten"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Einstellungen …"> -<!ENTITY torbutton.context_menu.preferences.key "P"> +<!ENTITY torbutton.context_menu.preferences.key "E"> <!ENTITY torbutton.context_menu.about "Über Torbutton …"> -<!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Öffne Netzwerkeinstellungen …"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.about.key "Ü"> +<!ENTITY torbutton.context_menu.networksettings "Netzwerkeinstellungen öffnen …"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Paket herunterladen …"> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutzvorkehrungen"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutzvorkehrungen"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Tor-URL kopieren"> -<!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Tor-URL in neuem Tab öffnen"> -<!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Tor-URL in neuem Fenster öffnen"> -<!ENTITY torbutton.context_menu.openTorWindow.key "d"> +<!ENTITY torbutton.context_menu.copyTor "Tor-Adresse kopieren"> +<!ENTITY torbutton.context_menu.copyTor.key "k"> +<!ENTITY torbutton.context_menu.openTorTab "Tor-Adresse in neuem Reiter öffnen"> +<!ENTITY torbutton.context_menu.openTorTab.key "F"> +<!ENTITY torbutton.context_menu.openTorWindow "Tor-Adresse in neuem Fenster öffnen"> +<!ENTITY torbutton.context_menu.openTorWindow.key "F"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 43aa7cd..c60b592 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Acerca de Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Abrir Preferencias de Red..."> +<!ENTITY torbutton.context_menu.networksettings "Abrir configuración de red…"> <!ENTITY torbutton.context_menu.networksettings.key "G"> <!ENTITY torbutton.context_menu.downloadUpdate "Descargar actualización del Paquete de Navegador Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "a"> @@ -145,6 +145,6 @@ <!ENTITY torbutton.prefs.fix_google_srch "Despojar de información de su plataforma e idioma a las consultas en los cuadros de busqueda de Google"> <!ENTITY torbutton.prefs.transparentTor "Torificación transparente (requiere un transproxy personalizado o un router Tor)"> <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceras partes y otros datos de seguimiento"> -<!ENTITY torbutton.prefs.block_plugins "Deshabilitar plugins del navegador (tales como Flash)"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> +<!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios de Navegador Tor"> diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index 05e9d84..dbff853 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -4,16 +4,16 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Acerca do Tor"> +<!ENTITY aboutTor.title "Sobre o Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALÉM DISSO, o seu navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado."> <!ENTITY aboutTor.outOfDate2.label "Clique no símbolo da cebola e escolha Download Tor Browser Bundle Update."> -<!ENTITY aboutTor.check.label "Teste as definições da rede Tor"> +<!ENTITY aboutTor.check.label "Testar as Definições da Rede Tor"> <!ENTITY aboutTor.success.label "Parabéns!"> -<!ENTITY aboutTor.success2.label "O seu navegador está configurado para usar o Tor."> +<!ENTITY aboutTor.success2.label "Este navegador está configurado para utilizar o Tor."> <!ENTITY aboutTor.success3.label "Agora já pode navegar a Internet de forma anónima."> <!ENTITY aboutTor.failure.label "Algo Correu Mal!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador.">

1 0

[torbutton/master] Update changelog for 1.6.12.0.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit ff97c029c4ae47e278c3304c178cd92cfa142415 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:32:52 2014 -0700 Update changelog for 1.6.12.0. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 7f04c4d..5b35a6a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.0 + 4 Aug 2014 + * Bug 9531: Workaround to avoid rare hangs during New Identity + 1.6.11.1 24 Jul 2014 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap diff --git a/src/install.rdf b/src/install.rdf index 6a3aded..f8c0f97 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.6.11.1</em:version> + <em:version>1.6.12.0</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] Bug 9535: Fix hang on New Identity.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit e4c902b03302f99ce69c3f148573aa89122d169f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 15:56:43 2014 +0000 Bug 9535: Fix hang on New Identity. The related bug 10804 needs a different fix as this one applied there would stall the start-up for a short amount of time resulting in a bad user experience. --- src/chrome/content/torbutton.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f682f05..4cd9c3d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1634,7 +1634,7 @@ function torbutton_do_new_identity() { } torbutton_log(3, "New Identity: Clearing LocalStorage"); - + try { Components.utils.import("resource:///modules/offlineAppCache.jsm"); OfflineAppCacheHelper.clear(); @@ -1700,6 +1700,18 @@ function torbutton_do_new_identity() { getService(Ci.nsIPermissionManager); pm.removeAll(); + // We spin the event queue until it is empty and we can be sure that sending + // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an + // invstigation on why and when this may happen). This is surrounded by + // suppressing/unsuppressing user initiated events in a window's document to + // be sure that these events are not interfering with processing events being + // in the event queue. + var thread = Cc["@mozilla.org/thread-manager;1"]. + getService(Ci.nsIThreadManager).currentThread; + m_tb_domWindowUtils.suppressEventHandling(true); + while (thread.processNextEvent(false)) {} + m_tb_domWindowUtils.suppressEventHandling(false); + torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym.

1 0

[tor-browser-bundle/maint-3.6] Fix changelog to say 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 23bccdb1ca1003a326b3815019aa88722d59e386 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:24:20 2014 -0700 Fix changelog to say 3.6.4. Also update Torbutton version to pick up some UI tweaks. --- Bundle-Data/Docs/ChangeLog.txt | 5 ++++- gitian/versions | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ecd891..d2468be 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,11 @@ -Tor Browser Bundle 3.6.3 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 * Bug 9516: Send Tor Launcher log messages to Browser Console + * Update Torbutton to 1.6.11.1 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms diff --git a/gitian/versions b/gitian/versions index 10690ce..e5e53e4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.11.0 +TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-3.6] Add Changelog fo 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit a37f1c0cf686c2ad3cdbe715c6b242a0d2cfb9ac Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:34:49 2014 -0700 Add Changelog fo 3.6.4. Also bump Tor Launcher version to pick up #9516. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ gitian/versions | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1e12190..7ecd891 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser Bundle 3.6.3 -- Aug 6 2014 + * All Platforms + * Update Tor to 0.2.4.23 + * Update Tor launcher to 0.2.5.6 + * Bug 9516: Send Tor Launcher log messages to Browser Console + Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms * Update Firefox to 24.7.0esr diff --git a/gitian/versions b/gitian/versions index 38eae32..10690ce 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.4pre +TORBROWSER_VERSION=3.6.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 -TORLAUNCHER_TAG=0.2.5.5 +TORLAUNCHER_TAG=0.2.5.6 TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1

1 0

[tor-launcher/maint-0.2.5] Bump version to 0.2.5.6.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit e058a548e736c75982873614631c1f4cb37b04a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:22:36 2014 -0700 Bump version to 0.2.5.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 702745d..bd64022 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.5</em:version> + <em:version>0.2.5.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Bug 12753: Zeroing timestamps in PE headers.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit ad5ea06183c12e8ae18274a72cb5bbc353180400 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 4 14:26:34 2014 +0000 Bug 12753: Zeroing timestamps in PE headers. Switching to a new toolchain for Windows (using Binutils 2.24 and GCC 4.8.3) led to new problems producing Windows bundles in a reliable fashion. Thanks to a patch by a cypherpunk we avoid differences in PE header timestamps as one possible source for the issues mentioned in bug 12753. --- gitian/descriptors/windows/gitian-utils.yml | 3 +++ gitian/patches/peXXigen.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 87a0bce..87dbe16 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -31,6 +31,7 @@ files: - "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" +- "peXXigen.patch" - "versions" - "dzip.sh" script: | @@ -45,6 +46,8 @@ script: | cd binutils* # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib make $MAKEOPTS make install diff --git a/gitian/patches/peXXigen.patch b/gitian/patches/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/gitian/patches/peXXigen.patch @@ -0,0 +1,14 @@ +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr);

1 0

[tor-browser-bundle/master] Use meek 0.10.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 69b9ca1b186a575debf823de760a0a048da03819 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Aug 2 00:57:37 2014 -0700 Use meek 0.10. 0.10 has the patch to set network.proxy.socks_remote_dns=false within the Firefox extension, so it doesn't have to be set in user.js. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index ae465d2..20c7e73 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d28bbdc..8f558d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.beta b/gitian/versions.beta index 16692b2..dbb50d8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Set a blackhole proxy in the meek-http-helper profile.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 92e501a980295a06c2eb94bf03370b66ef8e5563 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 27 09:53:07 2014 -0700 Set a blackhole proxy in the meek-http-helper profile. https://trac.torproject.org/projects/tor/ticket/12674 The extension manually overrides the proxy setting for every request, so this doesn't affect the functioning of the extension. It's intended as a failsafe to prevent network interaction in case something goes wrong and the user manages to disable the extension and open the profile with a normal browser window. In order to cause that to happen, I had to do: ./Browser/firefox -safe-mode -profile Data/Browser/profile.meek-http-helper/ Prior to this commit, running the above command would have given you an ordinary unproxied Firefox. Now you will get "The proxy server is refusing connections." --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index a95a6ec..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,13 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// 0 is "No proxy". -user_pref("network.proxy.type", 0); - -// Allow unproxied DNS. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:6 -user_pref("network.proxy.socks_remote_dns", false); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9 @@ -21,4 +14,17 @@ user_pref("security.enable_tls_session_tickets", true); // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1); +// Set a failsafe blackhole proxy of 127.0.0.1:9, to prevent network interaction +// in case the user manages to open this profile with a normal browser UI (i.e., +// not headless with the meek-http-helper extension running). Port 9 is +// "discard", so it should work as a blackhole whether the port is open or +// closed. network.proxy.type=1 means "Manual proxy configuration". +// http://kb.mozillazine.org/Network.proxy.type +user_pref("network.proxy.type", 1); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9); +// Make sure DNS is also blackholed. network.proxy.socks_remote_dns is +// overridden by meek-http-helper at startup. +user_pref("network.proxy.socks_remote_dns", true); + user_pref("extensions.enabledAddons", "meek-http-helper@bamsoftware.com:1.0");

1 0

[tor-launcher/maint-0.2.5] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 01 Aug '14

01 Aug '14

commit 40751d8580192902227a447ee89d8018a34800c9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index bcff6ab..0e78736 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -497,6 +503,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1275,6 +1282,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-launcher/master] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 31 Jul '14

31 Jul '14

commit 423552fe7009ebe8bd61f92ca525018c124a1b56 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 85a0165..9c4d957 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -496,6 +502,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1295,6 +1302,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere version to the 5.0-alpha series.
by mikeperry＠torproject.org 30 Jul '14

30 Jul '14

commit a6ec17d500fadaa6ce9259ac5a7bd8150504e2a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 29 18:41:37 2014 -0700 Bump HTTPS-Everywhere version to the 5.0-alpha series. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 54875ad..4b4a1a2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar - * Update HTTPS Everywhere to 3.5.3 + * Update HTTPS Everywhere to 5.0development.0 * Update Torbutton to 1.6.11.1 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 34c4409..d28bbdc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0development.17 +HTTPSE_VER=5.0development.0 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere to 4.0 for the TBB alpha.
by mikeperry＠torproject.org 29 Jul '14

29 Jul '14

commit 7c9c5f63ebc127b651c5bbc146be8d07cf12c961 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 19:26:55 2014 -0700 Bump HTTPS-Everywhere to 4.0 for the TBB alpha. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 69363a3..34c4409 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.3 +HTTPSE_VER=4.0development.17 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 +HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/maint-3.6] Bump Tor stable version.
by mikeperry＠torproject.org 29 Jul '14

29 Jul '14

commit efd8722961016b4c10f0bdd9c7fca5f0f58bf23a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 17:45:10 2014 -0700 Bump Tor stable version. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index c7348b7..38eae32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.3 +TORBROWSER_VERSION=3.6.4pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,7 +7,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 -TOR_TAG=tor-0.2.4.22 +TOR_TAG=tor-0.2.4.23 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-bundle/master] Bump Tor version and update changelog for 4.0-alpha-1.
by mikeperry＠torproject.org 28 Jul '14

28 Jul '14

commit ee84742da7aff980dca12fb410455a3a38f08bb2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 14:04:20 2014 -0700 Bump Tor version and update changelog for 4.0-alpha-1. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ef2dd84..54875ad 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr - * Update Tor to 0.2.5.5-alpha + * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 3.5.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 15a5d8b..69363a3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,7 +7,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.5-alpha +TOR_TAG=tor-0.2.5.6-alpha TORLAUNCHER_TAG=0.2.6.1 TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-bundle/master] Relocate recommended-versions file here.
by mikeperry＠torproject.org 26 Jul '14

26 Jul '14

commit a2370de2b0b44a22f3f2591c2960cd6767940b8b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:23:24 2014 -0700 Relocate recommended-versions file here. --- gitian/recommended-release-versions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitian/recommended-release-versions b/gitian/recommended-release-versions new file mode 100644 index 0000000..13ba64a --- /dev/null +++ b/gitian/recommended-release-versions @@ -0,0 +1,5 @@ +[ +"3.6.3-Linux", +"3.6.3-MacOS", +"3.6.3-Windows" +]

1 0

[tor-browser-bundle/master] Add 3.6.2 and 3.6.3 back in to master branch changelog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 6887900b9109b6b8f26c4a7738605a9b8bc332e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 16:26:14 2014 -0700 Add 3.6.2 and 3.6.3 back in to master branch changelog. --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae14c46..ef2dd84 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 +Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr @@ -24,6 +24,51 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore +Tor Browser Bundle 3.6.3 -- Jul 24 2014 + * All Platforms + * Update Firefox to 24.7.0esr + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 + * Update NoScript to 2.6.8.33 + * Update HTTPS Everywhere to 3.5.3 + * Bug 12673: Update FTE bridges + * Update Torbutton to 1.6.11.0 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Linux: + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore + +Tor Browser Bundle 3.6.2 -- Jun 9 2014 + * All Platforms + * Update Firefox to 24.6.0esr + * Update OpenSSL to 1.0.1h + * Update NoScript to 2.6.8.28 + * Update Tor to 0.2.4.22 + * Update Tor Launcher to 0.2.5.5 + * Bug 10425: Provide geoip6 file location to Tor process + * Bug 11754: Remove untranslated locales that were dropped from Transifex + * Bug 11772: Set Proxy Type menu correctly after restart + * Bug 11699: Change &#160 to   in UI elements + * Update Torbutton to 1.6.10.0 + * Bug 11510: about:tor should not report success if tor proxy is unreachable + * Bug 11783: Avoid b.webProgress error when double-clicking on New Identity + * Bug 11722: Add hidden pref to force remote Tor check + * Bug 11763: Fix pref dialog double-click race that caused settings to be reset + * Bug 11629: Support proxies with Pluggable Transports + * Updates FTEProxy to 0.2.15 + * Updates obfsproxy to 0.2.9 + * Backported Tor Patches: + * Bug 11654: Fix malformed log message in bug11156 patch. + * Bug 10425: Add in Tor's geoip6 files to the bundle distribution + * Bugs 11834 and 11835: Include Pluggable Transport documentation + * Bug 9701: Prevent ClipBoardCache from writing to disk. + * Bug 12146: Make the CONNECT Host header the same as the Request-URI. + * Bug 12212: Disable deprecated webaudio API + * Bug 11253: Turn on TLS 1.1 and 1.2. + * Bug 11817: Don't send startup time information to Mozilla. + Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1

1 0

[tor-browser-bundle/master] Update NoScript version.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 78fb6e10a6faa6fd1171b61dac24a5732faeaa28 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:24:42 2014 -0700 Update NoScript version. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6b72a2e..ae465d2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.22-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Update changelog for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit ac7c21aac2e598b996c6436f81c9e2c27a707c7f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:22:58 2014 -0700 Update changelog for Torbutton and Tor Launcher. --- Bundle-Data/Docs/ChangeLog.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 104a135..ae14c46 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,14 +3,20 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.5-alpha - * Update NoScript to 2.6.8.31 + * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 3.5.3 - * Update Torbutton to 1.6.11.0 + * Update Torbutton to 1.6.11.1 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. - * Update Tor Launcher to 0.2.6.0 + * Bug 12680: Change Torbutton URL in about dialog. + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Update Tor Launcher to 0.2.6.1 + * Bug 11199: Improve behavior if tor exits + * Bug 12451: Add option to hide TBB's logo + * Bug 11193: Change "Tor Browser Bundle" to "Tor Browser" + * Bug 11471: Ensure text fits the initial configuration dialog * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation * Linux:

1 0

[tor-browser-bundle/master] Bump versions for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit fae9b3e817af7d5fad0fa151f5bbe3efe7ff88b3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:14:18 2014 -0700 Bump versions for Torbutton and Tor Launcher. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2d7273d..15a5d8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,8 +8,8 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha -TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.11.0 +TORLAUNCHER_TAG=0.2.6.1 +TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-launcher/master] Bump version for 0.2.6.1.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 5658245110cfda72f27c97e79eb6aae052bcf0a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:03:44 2014 -0700 Bump version for 0.2.6.1. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index f5d64fa..a1b5d98 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.6.0</em:version> + <em:version>0.2.6.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Bug 12680: Change Torbutton URL in about dialog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit d01eadd91760507041df3a01a64ba8626c78d483 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 23 09:38:28 2014 +0000 Bug 12680: Change Torbutton URL in about dialog. --- src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul index e5c9525..79c6946 100644 --- a/src/chrome/content/about.xul +++ b/src/chrome/content/about.xul @@ -20,7 +20,7 @@ value="&torbutton.button.label;" onmouseover="event.target.style.cursor='pointer'" onmouseout="event.target.style.cursor='default'" - onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/torbutton/')"/> + onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/docs/torbutton/')"/> <label style="text-align:center; font-size:18px; margin-top: 10px; margin-bottom:20px;">&torbutton.about.summary;</label> <groupbox>

1 0

[torbutton/master] Bug 11472: about:tor logo and text may overlap.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 0fb285c3ca6b2196406084a50b11c641f2b8406e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 16 10:33:52 2014 -0400 Bug 11472: about:tor logo and text may overlap. This problem occurred in some non-English locales (e.g., de). We now reduce the font size of some elements if necessary. --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 ++++-- src/chrome/content/torbutton.js | 43 ++++++++++++++++++++++++++++ src/chrome/skin/aboutTor.css | 2 ++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b99bc7e..f8f829d 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -132,15 +132,20 @@ function insertPropertyStrings() <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> - <div class="hideIfTorOff"> + <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <h1>&aboutTor.success.label;</h1> + <br/> <h2 id="success2">&aboutTor.success2.label;</h2> + <br/> <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <br/> <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> </div> - <div class="hideIfTorOn"> + <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> <h1>&aboutTor.failure.label;</h1> + <br/> <h2>&aboutTor.failure2.label;</h2> + <br/> <h3>&aboutTor.failure3prefix.label;<a href="mailto:&aboutTor.failure3Link;" >&aboutTor.failure3Link;</a>&aboutTor.failure3suffix.label;</h3> </div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3e7cf62..f682f05 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -875,12 +875,55 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { e.appendChild(aDoc.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} + let containerName = "torstatus-" + (aTorOn ? "on" : "off") + "-container"; + torbutton_adjust_abouttor_fontsizes(aDoc, containerName); torbutton_update_abouttor_arrow(aDoc); } return isAboutTor; } +// Ensure that text in top area does not overlap the tor on/off (onion) image. +// This is done by reducing the font sizes as necessary. +function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) +{ + let imgElem = aDoc.getElementById("torstatus-image"); + let containerElem = aDoc.getElementById(aContainerName); + if (!imgElem || !containerElem) + return; + + try + { + let imgRect = imgElem.getBoundingClientRect(); + + for (let textElem = containerElem.firstChild; textElem; + textElem = textElem.nextSibling) + { + if ((textElem.nodeType != textElem.ELEMENT_NODE) || + (textElem.nodeName.toLowerCase() == "br")) + { + continue; + } + + let textRect = textElem.getBoundingClientRect(); + if (0 == textRect.width) + continue; + + // Reduce font to 90% of previous size, repeating the process up to 7 + // times. This allows for a maximum reduction to just less than 50% of + // the original size. + let maxTries = 7; + while ((textRect.left < imgRect.right) && (--maxTries >= 0)) + { + let style = aDoc.defaultView.getComputedStyle(textElem, null); + let fontSize = parseFloat(style.getPropertyValue("font-size")); + textElem.style.fontSize = (fontSize * 0.9) + "px"; + textRect = textElem.getBoundingClientRect(); + } + } + } catch (e) {} +} + // Determine X position of torbutton toolbar item and pass it through // to the xhtml document. function torbutton_update_abouttor_arrow(aDoc) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 192e345..0c12374 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -135,6 +135,8 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { margin-left: 30px; } +/* Use inline-block for text-oriented elements whose widths need to measured. */ +.torstatus-container *, .top div.hideIfTorIsUpToDate h3 { display: inline-block; }

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_12680'
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 8830630b30998dfcea4171e6ec1a32ed14c1ad5f Merge: 0fb285c d01eadd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:57:40 2014 -0700 Merge remote-tracking branch 'gk/bug_12680' src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbutton/master] Update version and changelog for 1.6.11.1.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit be0db9403efcde130744e7edb3daa401542dcd44 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:58:08 2014 -0700 Update version and changelog for 1.6.11.1. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a1c1428..7f04c4d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.11.1 + 24 Jul 2014 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. + 1.6.11.0 27 Jun 2014 * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/src/install.rdf b/src/install.rdf index 5eb071a..6a3aded 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.6.11.0</em:version> + <em:version>1.6.11.1</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

[tor-launcher/master] Bug 11199: Improve behavior if tor exits.
by brade＠torproject.org 24 Jul '14

24 Jul '14

commit b152a6ed537d08824782b9535daa7c8113418782 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 24 15:26:02 2014 -0400 Bug 11199: Improve behavior if tor exits. If Tor Launcher started the tor process and it exits, display a prompt that allows the user to restart tor. --- src/chrome/content/network-settings-wizard.xul | 17 ++-- src/chrome/content/network-settings.js | 90 +++++++++++--------- src/chrome/content/network-settings.xul | 19 +++-- src/chrome/content/progress.js | 2 +- src/chrome/locale/ach/network-settings.dtd | 2 +- src/chrome/locale/ach/torlauncher.properties | 1 - src/chrome/locale/ady/network-settings.dtd | 2 +- src/chrome/locale/ady/torlauncher.properties | 1 - src/chrome/locale/af-ZA/torlauncher.properties | 1 - src/chrome/locale/af/network-settings.dtd | 2 +- src/chrome/locale/af/torlauncher.properties | 1 - src/chrome/locale/ak/network-settings.dtd | 2 +- src/chrome/locale/ak/torlauncher.properties | 1 - src/chrome/locale/am-ET/torlauncher.properties | 1 - src/chrome/locale/am/network-settings.dtd | 2 +- src/chrome/locale/am/torlauncher.properties | 1 - src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 1 - src/chrome/locale/arn/network-settings.dtd | 2 +- src/chrome/locale/arn/torlauncher.properties | 1 - src/chrome/locale/ast/network-settings.dtd | 2 +- src/chrome/locale/ast/torlauncher.properties | 1 - src/chrome/locale/az/network-settings.dtd | 2 +- src/chrome/locale/az/torlauncher.properties | 1 - src/chrome/locale/be/network-settings.dtd | 2 +- src/chrome/locale/be/torlauncher.properties | 1 - src/chrome/locale/bg-BG/torlauncher.properties | 1 - src/chrome/locale/bg/network-settings.dtd | 2 +- src/chrome/locale/bg/torlauncher.properties | 1 - src/chrome/locale/bn-BD/torlauncher.properties | 1 - src/chrome/locale/bn-IN/network-settings.dtd | 2 +- src/chrome/locale/bn-IN/torlauncher.properties | 1 - src/chrome/locale/bn/network-settings.dtd | 2 +- src/chrome/locale/bn/torlauncher.properties | 1 - src/chrome/locale/bo/network-settings.dtd | 2 +- src/chrome/locale/bo/torlauncher.properties | 1 - src/chrome/locale/br/network-settings.dtd | 2 +- src/chrome/locale/br/torlauncher.properties | 1 - src/chrome/locale/bs/network-settings.dtd | 2 +- src/chrome/locale/bs/torlauncher.properties | 1 - src/chrome/locale/ca-ES/torlauncher.properties | 1 - src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/ca/torlauncher.properties | 1 - src/chrome/locale/ca(a)valencia/network-settings.dtd | 1 + src/chrome/locale/cs-CZ/torlauncher.properties | 1 - src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/cs/torlauncher.properties | 1 - src/chrome/locale/csb/network-settings.dtd | 2 +- src/chrome/locale/csb/torlauncher.properties | 1 - src/chrome/locale/cv/network-settings.dtd | 2 +- src/chrome/locale/cv/torlauncher.properties | 1 - src/chrome/locale/cy/network-settings.dtd | 2 +- src/chrome/locale/cy/torlauncher.properties | 1 - src/chrome/locale/da/network-settings.dtd | 2 +- src/chrome/locale/da/torlauncher.properties | 1 - src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 1 - src/chrome/locale/dz/network-settings.dtd | 2 +- src/chrome/locale/dz/torlauncher.properties | 1 - src/chrome/locale/el-GR/torlauncher.properties | 1 - src/chrome/locale/el/network-settings.dtd | 2 +- src/chrome/locale/el/torlauncher.properties | 1 - src/chrome/locale/en-GB/network-settings.dtd | 2 +- src/chrome/locale/en-GB/torlauncher.properties | 1 - src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 3 +- src/chrome/locale/eo/network-settings.dtd | 2 +- src/chrome/locale/eo/torlauncher.properties | 1 - src/chrome/locale/es-AR/network-settings.dtd | 2 +- src/chrome/locale/es-AR/torlauncher.properties | 1 - src/chrome/locale/es-CL/network-settings.dtd | 2 +- src/chrome/locale/es-CL/torlauncher.properties | 1 - src/chrome/locale/es-CO/network-settings.dtd | 2 +- src/chrome/locale/es-CO/torlauncher.properties | 1 - src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es-MX/torlauncher.properties | 1 - src/chrome/locale/es-NI/torlauncher.properties | 1 - src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/es/torlauncher.properties | 1 - src/chrome/locale/et/network-settings.dtd | 2 +- src/chrome/locale/et/torlauncher.properties | 1 - src/chrome/locale/eu/network-settings.dtd | 2 +- src/chrome/locale/eu/torlauncher.properties | 1 - src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fa/torlauncher.properties | 1 - src/chrome/locale/fi/network-settings.dtd | 2 +- src/chrome/locale/fi/torlauncher.properties | 1 - src/chrome/locale/fil/network-settings.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 1 - src/chrome/locale/fo/network-settings.dtd | 2 +- src/chrome/locale/fo/torlauncher.properties | 1 - src/chrome/locale/fr-CA/network-settings.dtd | 2 +- src/chrome/locale/fr-CA/torlauncher.properties | 1 - src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 1 - src/chrome/locale/fur/network-settings.dtd | 2 +- src/chrome/locale/fur/torlauncher.properties | 1 - src/chrome/locale/fy/network-settings.dtd | 2 +- src/chrome/locale/fy/torlauncher.properties | 1 - src/chrome/locale/ga/network-settings.dtd | 2 +- src/chrome/locale/ga/torlauncher.properties | 1 - src/chrome/locale/gl/network-settings.dtd | 2 +- src/chrome/locale/gl/torlauncher.properties | 1 - src/chrome/locale/gu-IN/network-settings.dtd | 2 +- src/chrome/locale/gu-IN/torlauncher.properties | 1 - src/chrome/locale/gu/network-settings.dtd | 2 +- src/chrome/locale/gu/torlauncher.properties | 1 - src/chrome/locale/gun/network-settings.dtd | 2 +- src/chrome/locale/gun/torlauncher.properties | 1 - src/chrome/locale/ha/network-settings.dtd | 2 +- src/chrome/locale/ha/torlauncher.properties | 1 - src/chrome/locale/he/network-settings.dtd | 2 +- src/chrome/locale/he/torlauncher.properties | 1 - src/chrome/locale/hi/network-settings.dtd | 2 +- src/chrome/locale/hi/torlauncher.properties | 1 - src/chrome/locale/hr-HR/network-settings.dtd | 2 +- src/chrome/locale/hr-HR/torlauncher.properties | 1 - src/chrome/locale/hr/network-settings.dtd | 2 +- src/chrome/locale/hr/torlauncher.properties | 1 - src/chrome/locale/ht/network-settings.dtd | 2 +- src/chrome/locale/ht/torlauncher.properties | 1 - src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/hu/torlauncher.properties | 1 - src/chrome/locale/hy-AM/network-settings.dtd | 2 +- src/chrome/locale/hy-AM/torlauncher.properties | 1 - src/chrome/locale/hy/network-settings.dtd | 2 +- src/chrome/locale/hy/torlauncher.properties | 1 - src/chrome/locale/ia/network-settings.dtd | 2 +- src/chrome/locale/ia/torlauncher.properties | 1 - src/chrome/locale/id/network-settings.dtd | 2 +- src/chrome/locale/id/torlauncher.properties | 1 - src/chrome/locale/is/network-settings.dtd | 2 +- src/chrome/locale/is/torlauncher.properties | 1 - src/chrome/locale/it/network-settings.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 1 - src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ja/torlauncher.properties | 1 - src/chrome/locale/jv/network-settings.dtd | 2 +- src/chrome/locale/jv/torlauncher.properties | 1 - src/chrome/locale/ka/network-settings.dtd | 2 +- src/chrome/locale/ka/torlauncher.properties | 1 - src/chrome/locale/kk/network-settings.dtd | 2 +- src/chrome/locale/kk/torlauncher.properties | 1 - src/chrome/locale/km/network-settings.dtd | 2 +- src/chrome/locale/km/torlauncher.properties | 1 - src/chrome/locale/kn/network-settings.dtd | 2 +- src/chrome/locale/kn/torlauncher.properties | 1 - src/chrome/locale/ko-KR/network-settings.dtd | 2 +- src/chrome/locale/ko-KR/torlauncher.properties | 1 - src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 1 - src/chrome/locale/ku/network-settings.dtd | 2 +- src/chrome/locale/ku/torlauncher.properties | 1 - src/chrome/locale/kw/network-settings.dtd | 2 +- src/chrome/locale/kw/torlauncher.properties | 1 - src/chrome/locale/ky/network-settings.dtd | 2 +- src/chrome/locale/ky/torlauncher.properties | 1 - src/chrome/locale/lb/network-settings.dtd | 2 +- src/chrome/locale/lb/torlauncher.properties | 1 - src/chrome/locale/lg/network-settings.dtd | 2 +- src/chrome/locale/lg/torlauncher.properties | 1 - src/chrome/locale/ln/network-settings.dtd | 2 +- src/chrome/locale/ln/torlauncher.properties | 1 - src/chrome/locale/lo/network-settings.dtd | 2 +- src/chrome/locale/lo/torlauncher.properties | 1 - src/chrome/locale/lt/network-settings.dtd | 2 +- src/chrome/locale/lt/torlauncher.properties | 1 - src/chrome/locale/lv/network-settings.dtd | 2 +- src/chrome/locale/lv/torlauncher.properties | 1 - src/chrome/locale/mg/network-settings.dtd | 2 +- src/chrome/locale/mg/torlauncher.properties | 1 - src/chrome/locale/mi/network-settings.dtd | 2 +- src/chrome/locale/mi/torlauncher.properties | 1 - src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/mk/torlauncher.properties | 1 - src/chrome/locale/ml/network-settings.dtd | 2 +- src/chrome/locale/ml/torlauncher.properties | 1 - src/chrome/locale/mn/network-settings.dtd | 2 +- src/chrome/locale/mn/torlauncher.properties | 1 - src/chrome/locale/mr/network-settings.dtd | 2 +- src/chrome/locale/mr/torlauncher.properties | 1 - src/chrome/locale/ms-MY/network-settings.dtd | 2 +- src/chrome/locale/ms-MY/torlauncher.properties | 1 - src/chrome/locale/ms/network-settings.dtd | 2 +- src/chrome/locale/ms/torlauncher.properties | 1 - src/chrome/locale/mt/network-settings.dtd | 2 +- src/chrome/locale/mt/torlauncher.properties | 1 - src/chrome/locale/my/network-settings.dtd | 2 +- src/chrome/locale/my/torlauncher.properties | 1 - src/chrome/locale/nah/network-settings.dtd | 2 +- src/chrome/locale/nah/torlauncher.properties | 1 - src/chrome/locale/nap/network-settings.dtd | 2 +- src/chrome/locale/nap/torlauncher.properties | 1 - src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/nb/torlauncher.properties | 1 - src/chrome/locale/nds/network-settings.dtd | 2 +- src/chrome/locale/nds/torlauncher.properties | 1 - src/chrome/locale/ne/network-settings.dtd | 2 +- src/chrome/locale/ne/torlauncher.properties | 1 - src/chrome/locale/nl-BE/network-settings.dtd | 2 +- src/chrome/locale/nl-BE/torlauncher.properties | 1 - src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/nl/torlauncher.properties | 1 - src/chrome/locale/nn/network-settings.dtd | 2 +- src/chrome/locale/nn/torlauncher.properties | 1 - src/chrome/locale/nso/network-settings.dtd | 2 +- src/chrome/locale/nso/torlauncher.properties | 1 - src/chrome/locale/oc/network-settings.dtd | 2 +- src/chrome/locale/oc/torlauncher.properties | 1 - src/chrome/locale/or/network-settings.dtd | 2 +- src/chrome/locale/or/torlauncher.properties | 1 - src/chrome/locale/pa/network-settings.dtd | 2 +- src/chrome/locale/pa/torlauncher.properties | 1 - src/chrome/locale/pap/network-settings.dtd | 2 +- src/chrome/locale/pap/torlauncher.properties | 1 - src/chrome/locale/pl-PL/network-settings.dtd | 2 +- src/chrome/locale/pl-PL/torlauncher.properties | 1 - src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 1 - src/chrome/locale/pms/network-settings.dtd | 2 +- src/chrome/locale/pms/torlauncher.properties | 1 - src/chrome/locale/ps/network-settings.dtd | 2 +- src/chrome/locale/ps/torlauncher.properties | 1 - src/chrome/locale/pt-BR/network-settings.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 1 - src/chrome/locale/pt/network-settings.dtd | 2 +- src/chrome/locale/pt/torlauncher.properties | 1 - src/chrome/locale/ro/network-settings.dtd | 2 +- src/chrome/locale/ro/torlauncher.properties | 1 - src/chrome/locale/ru/network-settings.dtd | 2 +- src/chrome/locale/ru/torlauncher.properties | 1 - src/chrome/locale/ru(a)petr1708/network-settings.dtd | 2 +- .../locale/ru(a)petr1708/torlauncher.properties | 1 - src/chrome/locale/sco/network-settings.dtd | 2 +- src/chrome/locale/sco/torlauncher.properties | 1 - src/chrome/locale/si-LK/network-settings.dtd | 2 +- src/chrome/locale/si-LK/torlauncher.properties | 1 - src/chrome/locale/sk-SK/network-settings.dtd | 2 +- src/chrome/locale/sk-SK/torlauncher.properties | 1 - src/chrome/locale/sk/network-settings.dtd | 2 +- src/chrome/locale/sk/torlauncher.properties | 1 - src/chrome/locale/sl-SI/network-settings.dtd | 2 +- src/chrome/locale/sl-SI/torlauncher.properties | 1 - src/chrome/locale/sl/network-settings.dtd | 2 +- src/chrome/locale/sl/torlauncher.properties | 1 - src/chrome/locale/sn/network-settings.dtd | 2 +- src/chrome/locale/sn/torlauncher.properties | 1 - src/chrome/locale/so/network-settings.dtd | 2 +- src/chrome/locale/so/torlauncher.properties | 1 - src/chrome/locale/son/network-settings.dtd | 2 +- src/chrome/locale/son/torlauncher.properties | 1 - src/chrome/locale/sq-AL/torlauncher.properties | 1 - src/chrome/locale/sq/network-settings.dtd | 2 +- src/chrome/locale/sq/torlauncher.properties | 1 - src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr/torlauncher.properties | 1 - src/chrome/locale/sr(a)latin/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/torlauncher.properties | 1 - src/chrome/locale/st/network-settings.dtd | 2 +- src/chrome/locale/st/torlauncher.properties | 1 - src/chrome/locale/su/network-settings.dtd | 2 +- src/chrome/locale/su/torlauncher.properties | 1 - src/chrome/locale/sv-SE/network-settings.dtd | 2 +- src/chrome/locale/sv-SE/torlauncher.properties | 1 - src/chrome/locale/sv/network-settings.dtd | 2 +- src/chrome/locale/sv/torlauncher.properties | 1 - src/chrome/locale/sw/network-settings.dtd | 2 +- src/chrome/locale/sw/torlauncher.properties | 1 - src/chrome/locale/szl/network-settings.dtd | 2 +- src/chrome/locale/szl/torlauncher.properties | 1 - src/chrome/locale/ta/network-settings.dtd | 2 +- src/chrome/locale/ta/torlauncher.properties | 1 - src/chrome/locale/te-IN/network-settings.dtd | 2 +- src/chrome/locale/te-IN/torlauncher.properties | 1 - src/chrome/locale/te/network-settings.dtd | 2 +- src/chrome/locale/te/torlauncher.properties | 1 - src/chrome/locale/tg/network-settings.dtd | 2 +- src/chrome/locale/tg/torlauncher.properties | 1 - src/chrome/locale/th/network-settings.dtd | 2 +- src/chrome/locale/th/torlauncher.properties | 1 - src/chrome/locale/ti/network-settings.dtd | 2 +- src/chrome/locale/ti/torlauncher.properties | 1 - src/chrome/locale/tk/network-settings.dtd | 2 +- src/chrome/locale/tk/torlauncher.properties | 1 - src/chrome/locale/tr/network-settings.dtd | 2 +- src/chrome/locale/tr/torlauncher.properties | 1 - src/chrome/locale/uk/network-settings.dtd | 2 +- src/chrome/locale/uk/torlauncher.properties | 1 - src/chrome/locale/ur-PK/network-settings.dtd | 2 +- src/chrome/locale/ur-PK/torlauncher.properties | 1 - src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/ur/torlauncher.properties | 1 - src/chrome/locale/uz/network-settings.dtd | 2 +- src/chrome/locale/uz/torlauncher.properties | 1 - src/chrome/locale/ve/network-settings.dtd | 2 +- src/chrome/locale/ve/torlauncher.properties | 1 - src/chrome/locale/vi/network-settings.dtd | 2 +- src/chrome/locale/vi/torlauncher.properties | 1 - src/chrome/locale/wa/network-settings.dtd | 2 +- src/chrome/locale/wa/torlauncher.properties | 1 - src/chrome/locale/wo/network-settings.dtd | 2 +- src/chrome/locale/wo/torlauncher.properties | 1 - .../locale/zh-CN.GB2312/torlauncher.properties | 1 - src/chrome/locale/zh-CN/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 1 - src/chrome/locale/zh-HK/network-settings.dtd | 2 +- src/chrome/locale/zh-HK/torlauncher.properties | 1 - src/chrome/locale/zh-TW/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 1 - src/chrome/locale/zh/torlauncher.properties | 1 - src/chrome/locale/zu/network-settings.dtd | 2 +- src/chrome/locale/zu/torlauncher.properties | 1 - src/chrome/skin/network-settings.css | 5 +- src/components/tl-process.js | 36 +++++++- src/components/tl-protocol.js | 40 ++++++--- src/modules/tl-util.jsm | 38 +++++++++ 316 files changed, 329 insertions(+), 376 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index da1e275..da81ced 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -155,13 +155,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="startingTorMessage">&torsettings.startingTor;</description> - <spring flex="1" /> - </hbox> - <hbox> - <spring flex="1" /> - <button id="restartButton" label="&torsettings.restart;" hidden="true" - oncommand="onRestartApp()" /> + <description>&torsettings.startingTor;</description> <spring flex="1" /> </hbox> <spring flex="1" /> @@ -173,7 +167,14 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" flex="1"/> + <description id="errorPanelMessage" /> + <spring flex="1" /> + </hbox> + <separator/> + <hbox> + <spring flex="1" /> + <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true" + oncommand="onRestartTor()" /> <spring flex="1" /> </hbox> <spring flex="1" /> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 4c922bb..bdfb5c1 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -24,6 +24,7 @@ const kSupportAddr = "help(a)rt.torproject.org"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; +const kTorOpenProgressTopic = "TorOpenProgressDialog"; const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; @@ -158,12 +159,16 @@ function initDialog() gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); + gObsService.addObserver(gObserver, kTorOpenProgressTopic, false); var status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && (status != gTorProcessService.kStatusRunning)) { - showStartingTorPanel(status == gTorProcessService.kStatusExited); + if (status == gTorProcessService.kStatusExited) + showErrorMessage(true, null); + else + showStartingTorPanel(); gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); } @@ -337,12 +342,16 @@ var gObserver = { else if (kTorProcessDidNotStartTopic == aTopic) { gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); - showErrorPanel(aData); + showErrorMessage(false, aData); } else if (kTorProcessExitedTopic == aTopic) { gObsService.removeObserver(gObserver, kTorProcessExitedTopic); - showStartingTorPanel(true); + showErrorMessage(true, null); + } + else if (kTorOpenProgressTopic == aTopic) + { + openProgressDialog(); } } }; @@ -365,7 +374,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showErrorPanel(); + showErrorMessage(false, null); setTimeout(function() { @@ -422,34 +431,49 @@ function advanceToWizardPanel(aPanelID) } -function showStartingTorPanel(aTorExited) +function showStartingTorPanel() { - if (aTorExited) + var haveWizard = (getWizard() != null); + if (haveWizard) { - // Show "Tor exited; please restart" message and Restart button. - var elem = document.getElementById("startingTorMessage"); - if (elem) - { - var s1 = TorLauncherUtil.getLocalizedString("tor_exited"); - var s2 = TorLauncherUtil.getLocalizedString("please_restart_app"); - elem.textContent = s1 + "\n\n" + s2; - } - var btn = document.getElementById("restartButton"); - if (btn) - btn.removeAttribute("hidden"); + showOrHideButton("back", false, false); + showOrHideButton("next", false, false); } showPanel("startingTor"); } -function showErrorPanel(aErrorMsg) +function showErrorMessage(aTorExited, aErrorMsg) { - showPanel("errorPanel"); var elem = document.getElementById("errorPanelMessage"); + var btn = document.getElementById("restartTorButton"); + if (aTorExited) + { + // Show "Tor exited" message and "Restart Tor" button. + aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited"); + + if (btn) + btn.removeAttribute("hidden"); + } + else + { + if (btn) + btn.setAttribute("hidden", true); + } + if (elem) elem.textContent = (aErrorMsg) ? aErrorMsg : ""; + showPanel("errorPanel"); + + var haveWizard = (getWizard() != null); + if (haveWizard) + { + showOrHideButton("back", false, false); + showOrHideButton("next", false, false); + } + var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) showCopyLogButton(haveErrorOrWarning); @@ -613,28 +637,16 @@ function onProxyTypeChange() } -function onRestartApp() +// Called when user clicks "Restart Tor" button after tor unexpectedly quits. +function onRestartTor() { - if (gIsInitialBootstrap) - { - // If the browser has not fully started yet, we cannot use the app startup - // service to restart it... so we use a delayed approach. - try - { - var obsSvc = Cc["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - obsSvc.notifyObservers(null, "TorUserRequestedQuit", "restart"); + // Re-add these observers in case they have been removed. + gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); + gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); + gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); - window.close(); - } catch (e) {} - } - else - { - // Restart now. - var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"] - .getService(Ci.nsIAppStartup); - asSvc.quit(asSvc.eAttemptQuit | asSvc.eRestart); - } + gTorProcessService._startTor(); + gTorProcessService._controlTor(); } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 4c4eeed..1fcd4a7 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -57,18 +57,27 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="startingTorMessage">&torsettings.startingTor;</description> + <description>&torsettings.startingTor;</description> <spring flex="1" /> </hbox> + <spring flex="1" /> + </vbox> + <vbox id="errorPanel"> + <spring flex="1" /> + <hbox> + <spring flex="1" /> + <description id="errorPanelMessage" /> + <spring flex="1" /> + </hbox> + <separator/> <hbox> <spring flex="1" /> - <button id="restartButton" label="&torsettings.restart;" hidden="true" - oncommand="onRestartApp()" /> + <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true" + oncommand="onRestartTor()" /> <spring flex="1" /> </hbox> <spring flex="1" /> </vbox> - <vbox id="errorPanel"/> <vbox id="bridgeHelp" class="help"> <vbox id="bridgeHelpContent" /> </vbox> diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 4cee3d6..30c4370 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -136,7 +136,7 @@ var gObserver = { { // TODO: provide a way to access tor log e.g., leave this dialog open // and display the open settings button. - onCancel(); + cleanup(); window.close(); } else if (kBootstrapStatusTopic == aTopic) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ach/torlauncher.properties +++ b/src/chrome/locale/ach/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ady/torlauncher.properties +++ b/src/chrome/locale/ady/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/af-ZA/torlauncher.properties +++ b/src/chrome/locale/af-ZA/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ak/torlauncher.properties +++ b/src/chrome/locale/ak/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/am-ET/torlauncher.properties +++ b/src/chrome/locale/am-ET/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 508b47a..c8bb154 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> -<!ENTITY torsettings.restart "إعادة تشغيل"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "اختياري"> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index ff393f7..a4fbe15 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=مُشغل تور torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوقع. -torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. torlauncher.tor_control_failed=تعذر التحكم في تور. diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/arn/torlauncher.properties +++ b/src/chrome/locale/arn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index 7518bd5..028263c 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 1677528..b9ca7d7 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index 20a24bb..9e02ff7 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/bg-BG/torlauncher.properties +++ b/src/chrome/locale/bg-BG/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 3cd0c05..f8f6c79 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> -<!ENTITY torsettings.restart "Рестарт"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Допълнителен"> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index d93bd1f..915da30 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Тор лънчер torlauncher.tor_exited=Тор спря принудително -torlauncher.please_restart_app=Моля, рестартирайте приложението. torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт torlauncher.tor_failed_to_start=Тор не стартира успешно torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/bn-IN/torlauncher.properties +++ b/src/chrome/locale/bn-IN/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/bo/torlauncher.properties +++ b/src/chrome/locale/bo/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index d7e5faa..e3b08d8 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index e460c45..8dccace 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties index d82d688..0157189 100644 --- a/src/chrome/locale/ca-ES/torlauncher.properties +++ b/src/chrome/locale/ca-ES/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index f98aba3..638d506 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperant a Tor per començar..."> -<!ENTITY torsettings.restart "Reinicia"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcional "> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index d2e1d15..29b22a2 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Inicialitzador Tor torlauncher.tor_exited=Tor ha sortit inesperadament. -torlauncher.please_restart_app=Si us plau reinicia l'aplicació. torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor torlauncher.tor_failed_to_start=Tor ha fallat al iniciar. torlauncher.tor_control_failed=No s'ha pogut prendre el control de Tor. diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index 0458e75..dadbdda 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.restartTor ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/cs-CZ/torlauncher.properties +++ b/src/chrome/locale/cs-CZ/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 84ca9ee..ff97202 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Čekání na start TORu"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Volitelný"> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 960bc88..cded48b 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor spouštěč torlauncher.tor_exited=Tor znenadání skončil. -torlauncher.please_restart_app=Prosím restartujte aplikaci. torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor. torlauncher.tor_failed_to_start=Tor nenastartoval. torlauncher.tor_control_failed=Nezdařilo se převzít kontrolu nad Tor. diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/csb/torlauncher.properties +++ b/src/chrome/locale/csb/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index 6213708..8dd497d 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties index 5f59ee4..9dc1f18 100644 --- a/src/chrome/locale/cv/torlauncher.properties +++ b/src/chrome/locale/cv/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index be1f716..9525451 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwyn…"> -<!ENTITY torsettings.restart "Ailgychwyn"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Dewisiol"> diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index f26cdfa..a2e6a2a 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lansiwr Tor torlauncher.tor_exited=Gadawodd Tor ar hap. -torlauncher.please_restart_app=Ailgychwynnwch y rhaglen hon. torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor. torlauncher.tor_failed_to_start=Methodd Tor gychwyn. torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor. diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index e5f79db..da32cfc 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> -<!ENTITY torsettings.restart "Genstart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Valgfri"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 143d876..13d9a5c 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. -torlauncher.please_restart_app=Genstart venligst programmet torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index c7d747c..4af4483 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet …"> -<!ENTITY torsettings.restart "Neustart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 8ba8ae1..5f7b2f7 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor-Starter torlauncher.tor_exited=Tor wurde unerwartet geschlossen. -torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen. torlauncher.tor_control_failed=Fehler, die Kontrolle über Tor zu übernehmen. diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/dz/torlauncher.properties +++ b/src/chrome/locale/dz/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/el-GR/torlauncher.properties +++ b/src/chrome/locale/el-GR/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index c7e6443..132bea8 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... "> -<!ENTITY torsettings.restart "Επανεκκίνηση"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Προεραιτικα"> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index e3f52f0..74ccbe4 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Το Tor σταμάτησε απροσδόκητα -torlauncher.please_restart_app=Παρακαλώ επανεκκινήστε την εφαρμογή. torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor. torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor. torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor. diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/en-GB/torlauncher.properties +++ b/src/chrome/locale/en-GB/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index d04cac5..bf2426a 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. +torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect +torlauncher.reconnect=Reconnect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index d3d0327..bdd711d 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 126153c..4eaf84a 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 5ada2f1..c037e32 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 2b293e8..d62b2fb 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lanzador de Tor torlauncher.tor_exited=Salida inesperada de Tor -torlauncher.please_restart_app=Por favor, reinicie esta aplicación torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor torlauncher.tor_control_failed=Falló toma de control de Tor diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/es-CO/torlauncher.properties +++ b/src/chrome/locale/es-CO/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 4eba7d2..a2bc877 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 577f9ea..3507a38 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lanzador Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.please_restart_app=Por favor reinicie la aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar con el puerto de control Tor torlauncher.tor_failed_to_start=Tor falló al iniciar. torlauncher.tor_control_failed=Falló al tomar control de Tor. diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/es-NI/torlauncher.properties +++ b/src/chrome/locale/es-NI/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 2bce6c5..24760dc 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando a que Tor arranque..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index c968541..192d1ed 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index 9c2007a..c1da578 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index b36bf3a..3440bbe 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index c390194..ea1c8cc 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten..."> -<!ENTITY torsettings.restart "Berrabiarazi"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Hautazkoa"> diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 3f4fb59..6a7e78a 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor abiarazlea torlauncher.tor_exited=Tor ustekabean irten da. -torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan. diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 634ca22..b1294d8 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> -<!ENTITY torsettings.restart "شروع دوباره"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "اختیاری"> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index fc8ac3b..448b0b8 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=اجرا کننده تور torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد. -torlauncher.please_restart_app=لطفا نرم افزار را مجددا راه اندازی نمایید. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 934ddf0..4bf8d6d 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> -<!ENTITY torsettings.restart "Käynnistä uudelleen"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Vaihtoehtoinen"> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index cdcac17..809b90c 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor-käynnistin torlauncher.tor_exited=Tor lopetti toimintansa yllättäen. -torlauncher.please_restart_app=Käynnistä sovellus uudestaan. torlauncher.tor_controlconn_failed=Ei voi ottaa yhteyttä Tor-hallintaporttiin. torlauncher.tor_failed_to_start=Tor ei käynnistynyt. torlauncher.tor_control_failed=Torin haltuun ottaminen epäonnistui. diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index b839b79..b840d23 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index 6628d89..64e5fbb 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 6a5c2ca..3ef3b9e 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> -<!ENTITY torsettings.restart "Redémarrer"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optionnel"> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index e0b1217..d7352f2 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lanceur Tor torlauncher.tor_exited=Tor a quitté de manière imprévue. -torlauncher.please_restart_app=Veuillez redémarrer cette application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 2a4b64e..826e958 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> -<!ENTITY torsettings.restart "Redémarrer"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optionnel"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index d113f54..ac7a128 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lanceur Tor torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. -torlauncher.please_restart_app=Veuillez redémarrer l'application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=Échec lors de la prise de contrôle de Tor. diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/fur/torlauncher.properties +++ b/src/chrome/locale/fur/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index e99e31f..2d70aac 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Á espera de que Tor comece ..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index a636bb3..9526a00 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lanzador do Tor torlauncher.tor_exited=O Tor saíu de vez. -torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor. torlauncher.tor_failed_to_start=Non se puido iniciar o Tor. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index dd7aa29..41cc87f 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/gun/torlauncher.properties +++ b/src/chrome/locale/gun/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ha/torlauncher.properties +++ b/src/chrome/locale/ha/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 9f715b1..cebbcc4 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…"> -<!ENTITY torsettings.restart "אתחול"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "רשות"> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 02c123f..6bfcbb2 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=משגר Tor torlauncher.tor_exited=‏Tor יצא במפתיעה. -torlauncher.please_restart_app=אנא הפעל מחדש את יישום זה. torlauncher.tor_controlconn_failed=לא הצליח להתחבר ליציאת שליטת Tor. torlauncher.tor_failed_to_start=Tor נכשל בהפעלה. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 9688f72..1eeddb6 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 220d7e0..eae3f46 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene..."> -<!ENTITY torsettings.restart "Ponovno pokreni "> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcionalno"> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index ffb1266..26e2174 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Pokretač Tora torlauncher.tor_exited=Tor je neočekivano izašao. -torlauncher.please_restart_app=Molimo Vas da ponovno pokrenete ovu aplikaciju. torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti. torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo. diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 17b36fc..4f50368 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index 587588f..b493793 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ht/torlauncher.properties +++ b/src/chrome/locale/ht/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 8443763..809421f 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> -<!ENTITY torsettings.restart "Újraindítás"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcionális"> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index a4e7a6f..1cd7c59 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Indító torlauncher.tor_exited=A Tor váratlanul kilépett. -torlauncher.please_restart_app=Kérjük indítsa újra ezt az alkalmazást. torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak. torlauncher.tor_control_failed=Nem sikerült átvenni a Tor vezérlését. diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index 345d5d9..63d5339 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties index 2e628d3..4de491e 100644 --- a/src/chrome/locale/hy-AM/torlauncher.properties +++ b/src/chrome/locale/hy-AM/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Վերաթողարկեք այս ծրագիրը: torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor-ի թողարկման սխալ; torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/hy/torlauncher.properties +++ b/src/chrome/locale/hy/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index 25f686e..de5dc49 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties index 574d73a..6eabb72 100644 --- a/src/chrome/locale/ia/torlauncher.properties +++ b/src/chrome/locale/ia/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 8b090d4..eac76c4 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opsional"> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index 846839f..6f9480b 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor gagal untuk memulai. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index f9ec97e..a4e4ce7 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 09b068f..7cece0e 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> -<!ENTITY torsettings.restart "Riavvia"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Facoltativo"> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index cd514cf..a6fc382 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è arrestato inaspettatamente. -torlauncher.please_restart_app=Per favore riavvia questa applicazione. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 4fe84c4..7d10085 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Torの開始を待っています..."> -<!ENTITY torsettings.restart "再起動"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "オプション"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index ad50a92..f08b28f 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Torは予期せず終了しました。 -torlauncher.please_restart_app=このアプリケーションを再起動してください。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 torlauncher.tor_control_failed=Tor の制御に失敗しました。 diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/jv/torlauncher.properties +++ b/src/chrome/locale/jv/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index f1b6799..b5e57a5 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "កំពុងរង់ចាំ Tor ចាប់ផ្ដើម..."> -<!ENTITY torsettings.restart "ចាប់ផ្ដើមឡើងវិញ"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "ជាជម្រើស"> diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index 6256079..7663cdf 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor torlauncher.tor_exited=បានចេញពី Tor ដោយមិនរំពឹងទុក -torlauncher.please_restart_app=សូមចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញ។ torlauncher.tor_controlconn_failed=មិនអាចភ្ជាប់ទៅច្រកពិនិត្យរបស់ Tor torlauncher.tor_failed_to_start=បានបរាជ័យក្នុងការចាប់ផ្ដើម Tor torlauncher.tor_control_failed=បានបរាជ័យក្នុងការពិនិត្យ Tor ។ diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index 114814b..61c76e2 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties index 4bcc82c..258712d 100644 --- a/src/chrome/locale/kn/torlauncher.properties +++ b/src/chrome/locale/kn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index 14f6303..daad46c 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index d0daf09..7c34c45 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 4956dc5..e35599c 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Tor 시작 대기 중..."> -<!ENTITY torsettings.restart "다시 시작"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "선택"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index ed43d43..a29cd25 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor 브라우저 Launcher torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. -torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요. torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. torlauncher.tor_failed_to_start=Tor 시작 실패. torlauncher.tor_control_failed=Tor 제어에 실패했습니다. diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ku/torlauncher.properties +++ b/src/chrome/locale/ku/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/kw/torlauncher.properties +++ b/src/chrome/locale/kw/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 20eb780..dec8285 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 6d13844..7bb504b 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/lg/torlauncher.properties +++ b/src/chrome/locale/lg/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ln/torlauncher.properties +++ b/src/chrome/locale/ln/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index a619211..c45457f 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 1f6e8d6..5ae3d6d 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 65a23ca..bd6aeaf 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Gaida, kamēr Tor startēs..."> -<!ENTITY torsettings.restart "Restartēt"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Neobligāts"> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 9ce39fd..cbe0e1b 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor palaidējs torlauncher.tor_exited=Tor negaidīti beidza darbu. -torlauncher.please_restart_app=Lūdzu, pārstartējiet šo lietotni. torlauncher.tor_controlconn_failed=Nevarēja veikt savienojumu ar Tor kontrolportu. torlauncher.tor_failed_to_start=Tor'am neizdevās startēt. torlauncher.tor_control_failed=Neizdevās pārņemt Tor vadību. diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/mg/torlauncher.properties +++ b/src/chrome/locale/mg/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/mi/torlauncher.properties +++ b/src/chrome/locale/mi/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 6d7d35c..a143b50 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index be1a741..98452de 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/mn/torlauncher.properties +++ b/src/chrome/locale/mn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index e72eb5f..b599240 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 7ddc1f3..b29d8cf 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=टॉर लाँचर torlauncher.tor_exited=टॉर अनपेक्षितपणे बंद झाले. -torlauncher.please_restart_app=हे अप्लिकेशन परत सुरू करा. torlauncher.tor_controlconn_failed=टॉर नियंत्रण पोर्टला जोडण्यात अपयश. torlauncher.tor_failed_to_start=टॉर सुरू होण्यात अपयश. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index ff872c9..53386ff 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan..."> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index cc510ed..74f8ff9 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Pelancar Tor torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja. -torlauncher.please_restart_app=Sila mulakan semula aplikasi ini. torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor. torlauncher.tor_failed_to_start=Tor gagal untuk bermula. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ms/network-settings.dtd b/src/chrome/locale/ms/network-settings.dtd index 723a055..0285f9a 100644 --- a/src/chrome/locale/ms/network-settings.dtd +++ b/src/chrome/locale/ms/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restartTor ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties index fcd4d83..0e49bc8 100644 --- a/src/chrome/locale/ms/torlauncher.properties +++ b/src/chrome/locale/ms/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/mt/torlauncher.properties +++ b/src/chrome/locale/mt/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 20e74bc..2f2890b 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "စက်ပြန်ဖွင့်ရန်"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index 293d193..3c09784 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/nah/torlauncher.properties +++ b/src/chrome/locale/nah/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/nap/torlauncher.properties +++ b/src/chrome/locale/nap/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 6162491..c9e12b4 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> -<!ENTITY torsettings.restart "Start på nytt"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Valgfritt"> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 8e56f67..fcacd68 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor ble uventet avsluttet. -torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Feilet i ta kontroll over Tor. diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/nds/torlauncher.properties +++ b/src/chrome/locale/nds/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 3a527c2..91c9614 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index c3d00d5..a84a1ff 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=टोर सुरुवातकर्ता torlauncher.tor_exited=टोर अनपेक्षित रुपमा बन्द भयो| -torlauncher.please_restart_app=कृपया यो सफ्टओएर पुन: संचालन गर्नुहोस | torlauncher.tor_controlconn_failed=टोरको नियेंत्रण पोर्टसंग जडान विफल भयो| torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो | torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index c362a5f..cda2b56 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Aan het wachten tot Tor gestart is..."> -<!ENTITY torsettings.restart "Herstart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optioneel"> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index f104345..8483fd6 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Starter torlauncher.tor_exited=Tor is onverwacht afgesloten. -torlauncher.please_restart_app=Herstart deze applicatie alstublieft. torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. torlauncher.tor_failed_to_start=Tor kon niet starten. torlauncher.tor_control_failed=Controle over Tor mislukt. diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 8d77b2e..0d95202 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/nso/torlauncher.properties +++ b/src/chrome/locale/nso/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/or/torlauncher.properties +++ b/src/chrome/locale/or/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 483c12a..b422fe9 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ"> -<!ENTITY torsettings.restart "ਮੁੜ-ਚਾਲੂ"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "ਚੋਣਵਾਂ"> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index f0056e4..53661cb 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕਰੋ torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/pap/torlauncher.properties +++ b/src/chrome/locale/pap/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index 9a2f3f6..f8cd238 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restartTor ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties index 54c1f90..f124981 100644 --- a/src/chrome/locale/pl-PL/torlauncher.properties +++ b/src/chrome/locale/pl-PL/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 312be05..34ac2c1 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "(opcjonalnie)"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 32feaa8..155ff50 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. -torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/pms/torlauncher.properties +++ b/src/chrome/locale/pms/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ps/torlauncher.properties +++ b/src/chrome/locale/ps/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 21c75e9..adb733c 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 5e9b860..53942ec 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Inicializador do Tor torlauncher.tor_exited=Tor fechou inesperadamente. -torlauncher.please_restart_app=Por favor, reinicie esta aplicação. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor. torlauncher.tor_failed_to_start=Falha ao iniciar Tor. torlauncher.tor_control_failed=Falha ao receber controle do Tor. diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index c231e10..2b47fd3 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "À espera que o Tor inicie..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Opcional"> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 780e44c..286c759 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. -torlauncher.please_restart_app=Por favor, reinicie a aplicação. torlauncher.tor_controlconn_failed=Não foi possível ligar ao porto de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. torlauncher.tor_control_failed=Falha ao tentar controlar o Tor diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 42f9cf9..64de5c5 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Reporneste"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 304c008..8fa13e4 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited=Tor a ieșit în mod neașteptat. -torlauncher.please_restart_app=Vă rugăm reporniți aplicația. torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. torlauncher.tor_failed_to_start=Tor nu poate porni. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index ea2ee82..3cf9cd2 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> -<!ENTITY torsettings.restart "Перезапустить"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Необязательно"> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index ad50365..bf9debe 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Загрузчик Tor torlauncher.tor_exited=Tor неожиданно завершился. -torlauncher.please_restart_app=Пожалуйста, перезапустите приложение torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. torlauncher.tor_control_failed=Не удалось взять контроль над Tor. diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index c6c2c19..bf31d5d 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties +++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/sco/torlauncher.properties +++ b/src/chrome/locale/sco/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index 6e09d16..fbd30da 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "TOR ආරම්භ වනතුරු …"> -<!ENTITY torsettings.restart "යලි අරඹන්න"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "අමතර"> diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties index dc2a9d0..a1f666a 100644 --- a/src/chrome/locale/si-LK/torlauncher.properties +++ b/src/chrome/locale/si-LK/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor පුරනය torlauncher.tor_exited=Tor අනපේක්ෂිත ලෙස නැතිවිය. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Tor පාලක පොර්ටයට සම්බන්ධ විය නොහැක. torlauncher.tor_failed_to_start=Tor ආරම්භ කිරීමට අපොහොසත්ය. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 0b32ddc..ce39661 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Voliteľne"> diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index c70e13d..1f133d6 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor sa nečakane vypol. -torlauncher.please_restart_app=Prosím, reštartujte túto aplikáciu. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 19e714c..500be4d 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Čakám kým sa Tor spustí..."> -<!ENTITY torsettings.restart "Reštart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Voliteľné"> diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 4743463..b016276 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Spúšťač Tor torlauncher.tor_exited=Tor bol neočakávane ukončený. -torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_control_failed=Nepodarilo sa prevziať kontrolu nad Torom. diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index f22e227..5d461aa 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index ed90244..82a1cbd 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor zaganjalnik torlauncher.tor_exited=Tor je se je nepredvideno zaustavil. -torlauncher.please_restart_app=Prosimo, da ponovno zaženete to aplikacijo. torlauncher.tor_controlconn_failed=Povezava na Tor nadzorna vrata ni uspela. torlauncher.tor_failed_to_start=Tor se ni zagnal. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties index 4bcdb55..d5fd4d3 100644 --- a/src/chrome/locale/sn/torlauncher.properties +++ b/src/chrome/locale/sn/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/so/torlauncher.properties +++ b/src/chrome/locale/so/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/son/torlauncher.properties +++ b/src/chrome/locale/son/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties index a2550db..6457d6b 100644 --- a/src/chrome/locale/sq-AL/torlauncher.properties +++ b/src/chrome/locale/sq-AL/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index d52b22c..d3d0ac3 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> -<!ENTITY torsettings.restart "Rihap"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Fakultativ"> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index 9685ea0..26bbbb0 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 5736f2c..45a74cd 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index 2b154b9..2edd6f0 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 7ebc424..d1bf809 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/st/torlauncher.properties +++ b/src/chrome/locale/st/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/su/torlauncher.properties +++ b/src/chrome/locale/su/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index 6ce1473..dadbdda 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restartTor ""> <!ENTITY torsettings.optional ""> diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties index fcd4d83..0e49bc8 100644 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ b/src/chrome/locale/sv-SE/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index b19b788..32f8bec 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> -<!ENTITY torsettings.restart "Starta om"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Valfri"> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 1d89986..513810e 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor stängdes av oväntat. -torlauncher.please_restart_app=Var god starta om det här programmet. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/szl/torlauncher.properties +++ b/src/chrome/locale/szl/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index f2acbba..3671894 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Tor தொடங்குவதற்கு காத்திருக்கிறது..."> -<!ENTITY torsettings.restart "மறுதுவக்கு"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "விருப்பத்தேர்வு"> diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index a8048f5..39ced49 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor துவக்கி torlauncher.tor_exited=Tor எதிர்பாராத விதமாக வெளியேறிவிட்டது. -torlauncher.please_restart_app=இந்த பயன்பாட்டை மறுதொடக்கம் செய்க. torlauncher.tor_controlconn_failed=Tor கட்டுப்பாட்டு துறையை இணைக்க முடியவில்லை. torlauncher.tor_failed_to_start=Tor தொடங்க முடியவில்லை. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/te-IN/torlauncher.properties +++ b/src/chrome/locale/te-IN/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index a0464b4..3781102 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "รอให้ Tor เริ่มทำงาน..."> -<!ENTITY torsettings.restart "เริ่มทำงานใหม่"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "ตัวเลือก"> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 8e26980..bd38765 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=ตัวเปิด Tor torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไม่คาดคิด -torlauncher.please_restart_app=กรุณาปิดเปิดแอพพลิเคชัน torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้ torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/tk/torlauncher.properties +++ b/src/chrome/locale/tk/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 7ac52b6..e08c7df 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor..."> -<!ENTITY torsettings.restart "Yeniden Başlat"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "İsteğe Bağlı"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index a8773d5..9fc4a88 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Başlatıcı torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı. -torlauncher.please_restart_app=Lütfen bu uygulamayı yeniden başlatın. torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı. torlauncher.tor_failed_to_start=Tor başlatılamadı. torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index c39cf08..10ff964 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Підключення до Tor..."> -<!ENTITY torsettings.restart "Перезавантажити"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Додатково"> diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 4045c47..239fd7b 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Завантажувач Tor torlauncher.tor_exited=Tor несподівано завершився. -torlauncher.please_restart_app=Будь ласка, перезапустіть цю програму. torlauncher.tor_controlconn_failed=Неможливо з'єднатися з портом управління Tor. torlauncher.tor_failed_to_start=Tor не зміг запуститися. torlauncher.tor_control_failed=Збій отримання контролю над Tor. diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index cd52dd6..a3e772f 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index d701651..6c91b1e 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index 3fa9532..78f7a1b 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Qayta ishga tushirish"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Qo'shimcha"> diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 08ce7aa..667ec18 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Dasturni qayta ishga tushiring torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor ishga tushirish muvaffaqiyatsiz tugadi. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/ve/torlauncher.properties +++ b/src/chrome/locale/ve/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index a52ee40..00b0a0f 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Chờ đợi để Tor khởi động.."> -<!ENTITY torsettings.restart "Khởi động lại"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Tuỳ chọn"> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index e70b4c1..5247f60 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/wa/torlauncher.properties +++ b/src/chrome/locale/wa/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/wo/torlauncher.properties +++ b/src/chrome/locale/wo/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties index d82d688..0157189 100644 --- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties +++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 28b973d..56cfaff 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> -<!ENTITY torsettings.restart "重新启动"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "可选"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 1f17dba..5c4a321 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor 启动器 torlauncher.tor_exited=Tor 意外退出。 -torlauncher.please_restart_app=请重启该应用程序。 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 torlauncher.tor_control_failed=控制 Tor 失败。 diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index c71c117..511ba2f 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 278038e..2a0fcd8 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor啟動器 torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=請重新啟動此程式。 torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 6d66ac6..3b7e359 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "正在等待 Tor 啟動…"> -<!ENTITY torsettings.restart "重新啟動"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "選項"> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 433b0dd..a320633 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor 啟動程式 torlauncher.tor_exited=Tor 未預期的關閉。 -torlauncher.please_restart_app=請重新啟動應用程式。 torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。 torlauncher.tor_failed_to_start=Tor 啟動失敗 torlauncher.tor_control_failed=無法控制 Tor. diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties index d82d688..0157189 100644 --- a/src/chrome/locale/zh/torlauncher.properties +++ b/src/chrome/locale/zh/torlauncher.properties @@ -4,7 +4,6 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index a346274..f46473e 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties index d04cac5..b6b7bd4 100644 --- a/src/chrome/locale/zu/torlauncher.properties +++ b/src/chrome/locale/zu/torlauncher.properties @@ -4,7 +4,6 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index b35eb52..a823914 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -98,12 +98,9 @@ button.firstAnswer { margin-left: 30px; } -#startingTor { - min-height: 300px; -} - wizardpage[pageid="startingTor"] description, wizardpage[pageid="errorPanel"] description, +#errorPanel description, #startingTor description { font-size: 120%; font-weight: bold; diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 2d3a3a3..619a32c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -140,14 +140,23 @@ TorProcessService.prototype = this.mTorProcess = null; this.mTorProcessStatus = this.kStatusExited; + this.mIsBootstrapDone = false; this.mObsSvc.notifyObservers(null, "TorProcessExited", null); if (!this.mIsQuitting) { + this.mProtocolSvc.TorCleanupConnection(); + var s = TorLauncherUtil.getLocalizedString("tor_exited"); - TorLauncherUtil.showAlert(null, s); TorLauncherLogger.log(4, s); + s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost"); + var btnLabel = TorLauncherUtil.getLocalizedString("reconnect"); + if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting) + { + this._startTor(); + this._controlTor(); + } } } else if ("timer-callback" == aTopic) @@ -420,6 +429,12 @@ TorProcessService.prototype = this._openNetworkSettings(true, panelID); } } + else if (this._networkSettingsWindow != null) + { + // If network settings is open, open progress dialog via notification. + if (this.mObsSvc) + this.mObsSvc.notifyObservers(null, "TorOpenProgressDialog", null); + } else { this._openProgressDialog(); @@ -547,9 +562,19 @@ TorProcessService.prototype = TorLauncherUtil.showSaveSettingsAlert(null, errObj.details); }, - // Blocks until network settings dialog is closed. + // If this window is already open, put up "starting tor" panel, focus it and return. + // Otherwise, open the network settings dialog and block until it is closed. _openNetworkSettings: function(aIsInitialBootstrap, aStartAtWizardPanel) { + var win = this._networkSettingsWindow; + if (win) + { + // Return to "Starting tor" panel if being asked to open & dlog already exists. + win.showStartingTorPanel(); + win.focus(); + return; + } + const kSettingsURL = "chrome://torlauncher/content/network-settings.xul"; const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul"; @@ -562,6 +587,13 @@ TorProcessService.prototype = wwSvc.openWindow(null, url, "_blank", winFeatures, argsArray); }, + get _networkSettingsWindow() + { + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Ci.nsIWindowMediator); + return wm.getMostRecentWindow("TorLauncher:NetworkSettings"); + }, + _openProgressDialog: function() { var chromeURL = "chrome://torlauncher/content/progress.xul"; diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index bcff6ab..85a0165 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -405,8 +405,7 @@ TorProtocolService.prototype = TorCleanupConnection: function() { this._closeConnection(); - this._closeConnection(this.mEventMonitorConnection); - this.mEventMonitorConnection = null; + this._shutDownEventMonitor(); }, TorStartEventMonitor: function() @@ -1163,6 +1162,17 @@ TorProtocolService.prototype = return this.mRNGService; }, + _shutDownEventMonitor: function() + { + if (this.mEventMonitorConnection) + { + this._closeConnection(this.mEventMonitorConnection); + this.mEventMonitorConnection = null; + this.mEventMonitorBuffer = null; + this.mEventMonitorInProgressReply = null; + } + }, + _waitForEventData: function() { if (!this.mEventMonitorConnection) @@ -1179,15 +1189,25 @@ TorProtocolService.prototype = return; } - var binStream = _this.mEventMonitorConnection.binInStream; - var bytes = binStream.readBytes(binStream.available()); - if (!_this.mEventMonitorBuffer) - _this.mEventMonitorBuffer = bytes; - else - _this.mEventMonitorBuffer += bytes; - _this._processEventData(); + try + { + var binStream = _this.mEventMonitorConnection.binInStream; + var bytes = binStream.readBytes(binStream.available()); + if (!_this.mEventMonitorBuffer) + _this.mEventMonitorBuffer = bytes; + else + _this.mEventMonitorBuffer += bytes; + _this._processEventData(); - _this._waitForEventData(); + _this._waitForEventData(); + } + catch (e) + { + // Probably we got here because tor exited. If tor is restarted by + // Tor Launcher, the event monitor will be restarted too. + TorLauncherLogger.safelog(4, "Event monitor read error", e); + _this._shutDownEventMonitor(); + } } }; diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 1754545..1b8c809 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -61,6 +61,44 @@ let TorLauncherUtil = // Public } }, + // Returns true if user confirms; false if not. + // Note that no prompt is shown (and false is returned) if the Network Settings + // window is open. + showConfirm: function(aParentWindow, aMsg, aOKButtonLabel) + { + try + { + if (!aParentWindow) + { + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Ci.nsIWindowMediator); + aParentWindow = wm.getMostRecentWindow("TorLauncher:NetworkSettings"); + if (aParentWindow) + return false; // Don't show prompt if Network Settings window is open. + + aParentWindow = wm.getMostRecentWindow("navigator:browser"); + } + + var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Ci.nsIPromptService); + var title = this.getLocalizedString("error_title"); + var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) + + ps.BUTTON_POS_0_DEFAULT + + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL); + + var notUsed = { value: false }; + var btnIndex = ps.confirmEx(aParentWindow, title, aMsg, btnFlags, + aOKButtonLabel, null, null, null, notUsed); + return (0 == btnIndex); + } + catch (e) + { + return confirm(aMsg); + } + + return false; + }, + showSaveSettingsAlert: function(aParentWindow, aDetails) { if (!aDetails)

1 0

[tor-browser-bundle/maint-3.6] Update gk's key.
by gk＠torproject.org 24 Jul '14

24 Jul '14

commit 14f24369ed409897ea976348780115e27ac8b678 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 24 14:46:31 2014 +0000 Update gk's key. --- gitian/gpg/gk.gpg | Bin 7025 -> 11926 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index a685ac5..9923c96 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Update gk's key.
by gk＠torproject.org 24 Jul '14

24 Jul '14

commit 5882e87897ff7b25e38fa8dd10b07c176dc1051f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 24 14:45:19 2014 +0000 Update gk's key. --- gitian/gpg/gk.gpg | Bin 7025 -> 11926 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index a685ac5..9923c96 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Remove FTE IPv6 bridges.
by mikeperry＠torproject.org 24 Jul '14

24 Jul '14

commit 9f8d7fcdcb71471805be68d6f9c76a43f2a60e32 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 23 20:16:50 2014 -0700 Remove FTE IPv6 bridges. They were AWS load balancer IPs and may change. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 5abe0cc..b01ad07 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -24,10 +24,6 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> -// <ipv6> -pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -// </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");

1 0

[tor-browser-bundle/maint-3.6] Mention FTE bridge update in changelog.
by mikeperry＠torproject.org 24 Jul '14

24 Jul '14

commit 2cb44d5cc253daaa7fac3832e1ec459addb7de23 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 23 20:16:01 2014 -0700 Mention FTE bridge update in changelog. --- 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 f3ff80d..1e12190 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser Bundle 3.6.3 -- Jul 24 2014 * Update FTE to 0.2.17 * Update NoScript to 2.6.8.33 * Update HTTPS Everywhere to 3.5.3 + * Bug 12673: Update FTE bridges * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI

1 0

[tor-browser-bundle/maint-3.6] Remove IPv6 FTE bridges.
by mikeperry＠torproject.org 24 Jul '14

24 Jul '14

commit 3c5b46a887ef2ccc471c88151980fd39d0cf6ca4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 23 20:15:33 2014 -0700 Remove IPv6 FTE bridges. They were AWS load balancer IPs and may change. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 5315a32..f4daa22 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -24,10 +24,6 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> -// <ipv6> -pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -// </ipv6> //pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); //pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");

1 0

[tor-browser-bundle/maint-3.6] Update changelog file (alas no fix for bug 12381).
by gk＠torproject.org 23 Jul '14

23 Jul '14

commit 02f15981b7cae7c4c47158416315af28cedf16aa Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 23 16:55:21 2014 +0000 Update changelog file (alas no fix for bug 12381). --- Bundle-Data/Docs/ChangeLog.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae783f6..f3ff80d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,20 +1,18 @@ Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms * Update Firefox to 24.7.0esr + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 * Update NoScript to 2.6.8.33 * Update HTTPS Everywhere to 3.5.3 * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. - * Bug 12381: Fix Pluggable Transport+Proxy Support on Windows - * Update obfsproxy to 0.2.12 - * Update FTE to 0.2.17 * Linux: * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore - Tor Browser Bundle 3.6.2 -- Jun 9 2014 * All Platforms * Update Firefox to 24.6.0esr

1 0

[tor-browser-bundle/master] Switch FTE bridges to IP-only+separate IPv6 bridges.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit ece1766b18f94b7937ac2497d7e3fb4b5fd62965 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:53:25 2014 -0700 Switch FTE bridges to IP-only+separate IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6ee714d..5abe0cc 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -17,21 +17,16 @@ pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); // <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> // <ipv6> -pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); // </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI");

1 0

[tor-browser-bundle/maint-3.6] Switch FTE bridges to IP-only+separate IPv6 bridges.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit ecd19a6a88058dedb1726747eb4184a959d5af6b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:47:02 2014 -0700 Switch FTE bridges to IP-only+separate IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9cb8a6a..5315a32 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -17,21 +17,16 @@ pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); // <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> // <ipv6> -pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); // </ipv6> //pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI");

1 0

[tor-browser-bundle/maint-3.6] Version bump and changelog for 3.6.3.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit 255493e367e32e12f2d32abd437d4987375a2804 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:52:25 2014 -0700 Version bump and changelog for 3.6.3. --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ gitian/versions | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3ea5232..ae783f6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser Bundle 3.6.3 -- Jul 24 2014 + * All Platforms + * Update Firefox to 24.7.0esr + * Update NoScript to 2.6.8.33 + * Update HTTPS Everywhere to 3.5.3 + * Update Torbutton to 1.6.11.0 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Bug 12381: Fix Pluggable Transport+Proxy Support on Windows + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 + * Linux: + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore + + Tor Browser Bundle 3.6.2 -- Jun 9 2014 * All Platforms * Update Firefox to 24.6.0esr diff --git a/gitian/versions b/gitian/versions index e11d9f1..c7348b7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.3pre +TORBROWSER_VERSION=3.6.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 -TORBUTTON_TAG=1.6.10.0 +TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Check kvm group membership prerequisite.
by mikeperry＠torproject.org 22 Jul '14

22 Jul '14

commit f3bb332309c205ac8b1dfd954ec7f2ccb4033f0a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 12:43:20 2014 -0700 Check kvm group membership prerequisite. If the user is not at the X11 console, then they must be in the kvm group to access /dev/kvm. --- gitian/check-prerequisites.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index e470b84..62167e9 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -49,7 +49,7 @@ then fi if [ "z$USE_LXC" != "z1" ]; -then +then groups | grep libvirtd > /dev/null if [ $? -ne 0 ]; then @@ -60,6 +60,19 @@ then echo " newgrp libvirtd" exit 1 fi + if [ -z "$DISPLAY" ]; + then + groups | grep kvm > /dev/null + if [ $? -ne 0 ]; + then + echo "You need to be in the kvm group to run Gitian on a headless server." + echo + echo "Please run:" + echo " sudo adduser $USER kvm" + echo " newgrp kvm" + exit 1 + fi + fi fi

1 0

[tor-browser-bundle/master] Bump NoScript version in alpha and nightly target.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 4d0a5bbeb4f6cf20120953e6896eada48cbb6dd4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 21:05:39 2014 +0000 Bump NoScript version in alpha and nightly target. --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1b1d7d7..2d7273d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.31-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 +NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 59c55dc..f61f5e8 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.6.8.31-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 +NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-3.6] NoScript and HTTPS-E version bump.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit bb3eab34bbecba26af4f2112a7140ed656b72e8f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 20:52:30 2014 +0000 NoScript and HTTPS-E version bump. --- gitian/versions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6f3c7eb..e11d9f1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0 -HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,12 +41,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=3.5.3 ## 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.6.8.28-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -74,8 +74,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 +HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-3.6] Bug 12381: Add the real fte 0.2.17 commit.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 5c33ddd0275065a04d099c86676ffed675732e86 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 20:15:34 2014 +0000 Bug 12381: Add the real fte 0.2.17 commit. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index c0e5047..6f3c7eb 100755 --- a/gitian/versions +++ b/gitian/versions @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 +FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Bug 12381: Add the real fte 0.2.17 commit.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 7bc4b8471a2bc81a9c1d60a2e696764421852995 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 20:14:07 2014 +0000 Bug 12381: Add the real fte 0.2.17 commit. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 657cc50..6b72a2e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 +FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1250075..1b1d7d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 +FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.beta b/gitian/versions.beta index f45bc9b..16692b2 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 +FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2

1 0

[tor-browser-bundle/master] Bug 12381: Added new obfsproxy tag.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 77f4826e45678a62e909b6803176650e8de47962 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 19:28:40 2014 +0000 Bug 12381: Added new obfsproxy tag. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index b51c2af..657cc50 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 -OBFSPROXY_TAG=obfsproxy-0.2.9 +OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e8957a0..1250075 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 -OBFSPROXY_TAG=obfsproxy-0.2.9 +OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 diff --git a/gitian/versions.beta b/gitian/versions.beta index 2e2754a..f45bc9b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 -OBFSPROXY_TAG=obfsproxy-0.2.9 +OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17

1 0

[tor-browser-bundle/maint-3.6] Bug 12381: Added new obfsproxy tag.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 3ecbd771e26aaa36f3603be6196d90d245c54e41 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 19:26:48 2014 +0000 Bug 12381: Added new obfsproxy tag. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 17e2e37..c0e5047 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 -OBFSPROXY_TAG=obfsproxy-0.2.9 +OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17

1 0

[tor-browser-bundle/maint-3.6] Bug 12381, 12673: Squashed + merged kpdyer/master.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit e0e68e5713f6db5ca2756f7082094cb421c067a2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 19:22:08 2014 +0000 Bug 12381, 12673: Squashed + merged kpdyer/master. This hopefully fixes fte over proxy support (12381) and adds new fte bridges (12673). --- Bundle-Data/PTConfigs/bridge_prefs.js | 22 +++++++++++++++++----- gitian/versions | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6d8ac38..9cb8a6a 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,11 +16,23 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// <ipv4> +pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// </ipv4> +// <ipv6> +pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +// </ipv6> //pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); //pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); diff --git a/gitian/versions b/gitian/versions index a8a6fb7..17e2e37 100755 --- a/gitian/versions +++ b/gitian/versions @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Bug 12381, 12673: Squashed + merged kpdyer/master.
by gk＠torproject.org 22 Jul '14

22 Jul '14

commit 3135c79f586cc635fe6c8ab88b800ec9065dff90 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 22 19:04:32 2014 +0000 Bug 12381, 12673: Squashed + merged kpdyer/master. This hopefully fixes fte over proxy support (12381) and adds new fte bridges (12673). --- Bundle-Data/PTConfigs/bridge_prefs.js | 22 +++++++++++++++++----- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 5a1532e..6ee714d 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,11 +16,23 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// <ipv4> +pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// </ipv4> +// <ipv6> +pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +// </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); diff --git a/gitian/versions b/gitian/versions index 0372cf7..b51c2af 100755 --- a/gitian/versions +++ b/gitian/versions @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6be86bd..e8957a0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.beta b/gitian/versions.beta index aedcf44..2e2754a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2

1 0

[tor-browser-bundle/master] Bug 12381: Explain move to 'install_lib'.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit 5400da654020a34edb9edee70a0583a89231c4fe Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 18 21:31:14 2014 +0000 Bug 12381: Explain move to 'install_lib'. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index fb79422..1580152 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -231,6 +231,9 @@ script: | # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . mkdir vcversioner-1.14.1.1-py2.7.egg + # We need 'install_lib' here instead of 'install' as py2exe cannot handle + # zipped .egg files that are generated by the 'install' target. See bug + # 12381 for more details. LD_PRELOAD= $INSTPYTHON setup.py install_lib cd ..

1 0

[tor-browser-bundle/maint-3.6] Bug 12381: Make PTs + proxy working on Windows.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit 34aedfbae28ed04ad7fe1df0695d246e8e14313a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 18 21:28:25 2014 +0000 Bug 12381: Make PTs + proxy working on Windows. py2exe does not cope with zipped .egg files and raises an import error if it encounters a respective module. We work around this bug by using not the 'install' but the 'install_lib' target when building and installing txsocksx. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 6af344c..cc38427 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -210,7 +210,10 @@ script: | # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . mkdir vcversioner-1.14.1.1-py2.7.egg - LD_PRELOAD= $INSTPYTHON setup.py install + # We need 'install_lib' here instead of 'install' as py2exe cannot handle + # zipped .egg files that are generated by the 'install' target. See bug + # 12381 for more details. + LD_PRELOAD= $INSTPYTHON setup.py install_lib cd .. # Building obfsproxy

1 0

[tor-browser-bundle/master] Bug 12381: Make PTs + proxy working on Windows.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit 5c307a89c22cfd2d3b38d8215539324213fafcfb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 18 21:13:05 2014 +0000 Bug 12381: Make PTs + proxy working on Windows. py2exe does not cope with zipped .egg files and raises an import error if it encounters a respective module. We work around this bug by using not the 'install' but the 'install_lib' target when building and installing txsocksx. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 341c6aa..fb79422 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -231,7 +231,7 @@ script: | # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . mkdir vcversioner-1.14.1.1-py2.7.egg - LD_PRELOAD= $INSTPYTHON setup.py install + LD_PRELOAD= $INSTPYTHON setup.py install_lib cd .. # Building obfsproxy

1 0

[tor-browser-bundle/master] Use -s when linking golang programs.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit a2010553088bdb19b0cdd3b022c882b90c7046b3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 17 14:35:38 2014 +0000 Use -s when linking golang programs. -s is "omit the symbol table and debug information." It saves a MB or so on linux64 according to tests at https://trac.torproject.org/projects/tor/ticket/12387#comment:7. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 4 ++-- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index aaaa0f8..f9e2b51 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -207,11 +207,11 @@ script: | cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - go build + go build -ldflags '-s' cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 51fe9d0..d0322f8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -236,11 +236,11 @@ script: | cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. - go build + go build -ldflags '-s' cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $TBDIR/Docs/meek diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index fc06cd9..341c6aa 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -304,15 +304,15 @@ script: | cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - go build + go build -ldflags '-s' cp -a meek-client.exe $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser.exe $PTDIR cd .. cd terminateprocess-buffer - go build + go build -ldflags '-s' cp -a terminateprocess-buffer.exe $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek

1 0

[tor-browser-bundle/master] Upgrade go to 1.3.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit 5ae0dd9faf3457d7302069345a366a92b8b3fde0 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 17 17:01:19 2014 +0000 Upgrade go to 1.3. The cross-cgo.patch file is deleted, because cgo in cross builds is fixed in 1.3. http://golang.org/doc/go1.3#gocmd https://code.google.com/p/go/issues/detail?id=4714#c28 The download page moved to http://golang.org/dl/. golang.org has https, but the Wget 1.13.4 from Ubuntu 12.04 doesn't have SNI support, which appears to be necessary: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653267 --2014-07-17 17:20:11-- https://golang.org/dl/go1.3.src.tar.gz Resolving golang.org (golang.org) 74.125.20.141, 2607:f8b0:400e:c01::8d Connecting to golang.org (golang.org)|74.125.20.141|:443... connected. ERROR: no certificate subject alternative name matches requested host name `golang.org'. To connect to golang.org insecurely, use `--no-check-certificate'. --- .../mac/gitian-pluggable-transports.yml | 20 ++++++++++---------- .../windows/gitian-pluggable-transports.yml | 20 +++++++++++--------- gitian/fetch-inputs.sh | 4 ++-- gitian/patches/cross-cgo.patch | 16 ---------------- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 6 +++--- 8 files changed, 35 insertions(+), 49 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 420b94d..51fe9d0 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -41,7 +41,6 @@ files: - "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" -- "cross-cgo.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -85,12 +84,13 @@ script: | export GOOS=darwin export GOARCH=386 tar xvf go.tar.gz - cd go - patch -p1 < ~/build/cross-cgo.patch - cd src - # Disable CC et al. that are set up for cross builds. (The Go compiler is a - # cross-compiler, but it needs to run on *this* host.) - CC= CFLAGS= LDFLAGS= LDSHARED= ./make.bash + cd go/src + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" @@ -227,7 +227,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install git.torproject.org/pluggable-transports/goptlib.git + go install git.torproject.org/pluggable-transports/goptlib.git cd .. # Building meek @@ -236,11 +236,11 @@ script: | cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go build + go build cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go build + go build cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $TBDIR/Docs/meek diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index d68ace4..fc06cd9 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -48,7 +48,6 @@ files: - "python.msi" - "py2exe.exe" - "go.tar.gz" -- "cross-cgo.patch" - "dzip.sh" - "pyc-timestamp.sh" - "openssl-win32-utils.zip" @@ -139,10 +138,13 @@ script: | export GOOS=windows export GOARCH=386 tar xvf go.tar.gz - cd go - patch -p1 < ~/build/cross-cgo.patch - cd src - ./make.bash + cd go/src + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="i686-w64-mingw32-gcc" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" @@ -295,22 +297,22 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install git.torproject.org/pluggable-transports/goptlib.git + go install git.torproject.org/pluggable-transports/goptlib.git cd .. # Building meek cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a meek-client.exe $PTDIR cd .. cd meek-client-torbrowser - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a meek-client-torbrowser.exe $PTDIR cd .. cd terminateprocess-buffer - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a terminateprocess-buffer.exe $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d318fa5..086085c 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -158,7 +158,7 @@ done # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. -for i in ARGPARSE GO +for i in ARGPARSE do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL_DCF}${!PACKAGE}" @@ -172,7 +172,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" diff --git a/gitian/patches/cross-cgo.patch b/gitian/patches/cross-cgo.patch deleted file mode 100644 index eebe0d0..0000000 --- a/gitian/patches/cross-cgo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/cmd/go/build.go 2014-02-17 05:38:55.806060278 +0000 -+++ b/src/cmd/go/build.go 2014-02-17 05:39:40.414057143 +0000 -@@ -1928,9 +1928,10 @@ - ) - - func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string, gxxfiles []string) (outGo, outObj []string, err error) { -- if goos != toolGOOS { -- return nil, nil, errors.New("cannot use cgo when compiling for a different operating system") -- } -+ // https://code.google.com/p/go/issues/detail?id=4714#c7 -+ // if goos != toolGOOS { -+ // return nil, nil, errors.New("cannot use cgo when compiling for a different operating system") -+ // } - - cgoCPPFLAGS := stringList(envList("CGO_CPPFLAGS"), p.CgoCPPFLAGS) - cgoCFLAGS := stringList(envList("CGO_CFLAGS"), p.CgoCFLAGS) diff --git a/gitian/versions b/gitian/versions index e1b4f55..0372cf7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=https://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b406f45..6be86bd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.3 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=https://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 2594f60..aedcf44 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -91,7 +91,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -116,4 +116,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=https://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5398126..59c55dc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.3 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=https://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE}

1 0

[tor-browser-bundle/maint-3.6] Bump 3.6 to Firefox 27.7.0.
by mikeperry＠torproject.org 16 Jul '14

16 Jul '14

commit aff7663db9ef47c782f5001ee9869157e6bd0816 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 16 11:51:36 2014 -0700 Bump 3.6 to Firefox 27.7.0. --- gitian/versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 37a0d66..a8a6fb7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.6.2 +TORBROWSER_VERSION=3.6.3pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0

1 0

[tor-browser-bundle/master] Update Firefox version to 27.7.0 in nightly and alpha.
by mikeperry＠torproject.org 16 Jul '14

16 Jul '14

commit 4afce310c0a633e9d285e6ae3ea0801d0e12d59e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 16 11:50:14 2014 -0700 Update Firefox version to 27.7.0 in nightly and alpha. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0ea1dc2..104a135 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) + * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.5-alpha * Update NoScript to 2.6.8.31 * Script permissions now apply based on URL bar diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e73d2ae..b406f45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 617c3dd..5398126 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master

1 0

[tor-browser-bundle/master] Bug 12391: Get mingw-w64 compiled reliably.
by gk＠torproject.org 16 Jul '14

16 Jul '14

commit 5b71d6072028e0d582ad7405597fd615586a0734 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 16 19:24:48 2014 +0000 Bug 12391: Get mingw-w64 compiled reliably. It seems libfaketime is the culprit for the intermittent build failures (which might be nothing else than an instance of bug 11459). The workaround is to omit the compiler (and linker) from this restriction and to cross the fingers that the libgcc* etc. we ship, too, are still getting built deterministically. So far this seems to work out... --- gitian/descriptors/windows/gitian-utils.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index d9bf928..87a0bce 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -36,8 +36,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -79,9 +77,7 @@ script: | # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec" gcc-*/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ - # XXX: Using $MAKEOPTS (tested with -j4) breaks the build which does not - # happen in a non-gitian environment. This is probably related to bug 11459. - make all-gcc + make $MAKEOPTS all-gcc make install-gcc cd .. # @@ -104,6 +100,13 @@ script: | make install cd .. + # XXX: Build the libraries we include into the bundles deterministically. As + # libfaketime breaks the mingw-w64 build (probably due to bug 11459) we omit + # the compiler and linker from it. It seems we get away with this strategy + # and the libgcc* and libss* which we ship, too, are still built in a + # reproducible fashion. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME # Building zlib export CFLAGS="-mwindows" export LDFLAGS="-mwindows"

1 0

[tor-browser-bundle/master] Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'.
by gk＠torproject.org 16 Jul '14

16 Jul '14

commit 798f147f44ff80d2104ed3b0162f17198dd2a4f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 16 02:33:00 2014 +0000 Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'. * FIXES #12624, a bug caused by the TOR_CONTROL_PASSWD being by default set to '"secret"' in the example, and then mistakenly not unset in the setControlPasswd() function. --- RelativeLink/RelativeLink.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 4e6b7bb..e75482a 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -220,7 +220,12 @@ export LD_LIBRARY_PATH function setControlPortPasswd() { local ctrlPasswd=$1 - test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' && return + + if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then + unset TOR_CONTROL_PASSWD + return + fi + if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" printf "Using system Tor process.\n" export TOR_CONTROL_PASSWD

1 0

[tor-browser-bundle/maint-3.6] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 7bdb7f0df642f0613dc0096d3f37f3efd61d212a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:26:08 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b8155a7..37a0d66 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5ad3b82..4906e1c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,7 @@ LIBFTE_TAG=0.0.2 FTEPROXY_TAG=0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 5a9f2b8..c76acde 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a88421b..e19ebdc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 3caa9489db34c573460ed79e2b613b54ebfd0933 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:24:34 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 11b35ad..e1b4f55 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 32b0c88..e73d2ae 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index f019dc4..2594f60 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4133d03..617c3dd 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3

1 0

[gitian-builder/tor-browser-builder-3] Switch from rsync to tar for copy-to-target.
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit ae72871ea2e1c731ee34bba27a47fcce1b79786e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 15:08:29 2014 -0700 Switch from rsync to tar for copy-to-target. In Ubuntu 14.04, rsync now fails on dangling symlinks. --- libexec/copy-to-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/copy-to-target b/libexec/copy-to-target index 5843595..82c102a 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -47,7 +47,7 @@ if [ $# = 0 ] ; then fi if [ -z "$USE_LXC" ]; then - rsync -a -L -e "ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT" $1 $TUSER@localhost:$2 + tar -h -C `dirname "$1"` -cf - `basename "$1"` | ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost -- tar -C "$2" -xf - else config-lxc tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf -

1 0

[tor-browser-bundle/master] Use https for www.python.org URLs.
by gk＠torproject.org 15 Jul '14

15 Jul '14

commit 3fd5de596b16b001773333966c5936c346b65bda Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 14 17:04:12 2014 +0000 Use https for www.python.org URLs. This avoids a 301 redirect to https during fetch-inputs.sh. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 98fc74d..11b35ad 100755 --- a/gitian/versions +++ b/gitian/versions @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 425bbfd..32b0c88 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.beta b/gitian/versions.beta index c8a2957..f019dc4 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -103,8 +103,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e129726..4133d03 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG…

1 0

[tor-launcher/master] Bug 12451: add option to hide TBB's logo
by brade＠torproject.org 15 Jul '14

15 Jul '14

commit 6cf204d64cb8829ca4a7a8d3bc8d601ff4cf534d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 15 10:22:51 2014 -0400 Bug 12451: add option to hide TBB's logo Use 'make TL_LOGO=- ...' to build without a logo or 'make TL_LOGO=path.png ...' to substitute a custom logo (115 x 80 pixels). --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 940bbdc..f629d52 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See src/LICENSE for licensing information. EXT_NAME=tor-launcher @@ -28,6 +28,13 @@ pkg-prepare: clean @mkdir -p pkg $(eval TMP="$(shell mktemp -d "/tmp/$(EXT_NAME).XXXXXX")") @cp -a "src" "$(TMP)/$(EXT_NAME)" + @if [ -n "$(TL_LOGO)" ]; then \ + if [ "$(TL_LOGO)" = "-" ]; then \ + rm "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \ + else \ + cp -p "$(TL_LOGO)" "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \ + fi \ + fi @cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \ "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US

1 0

[tor-launcher/master] Improve error display when tor fails to start.
by brade＠torproject.org 14 Jul '14

14 Jul '14

commit 5880ff99682b9b94c5a80d8932b8465c04127507 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 14 16:44:13 2014 -0400 Improve error display when tor fails to start. --- src/chrome/content/network-settings-wizard.xul | 19 ++++++++++++++++--- src/chrome/content/network-settings.js | 23 +++++++++-------------- src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 07fcdcd..da1e275 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -26,8 +26,10 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> +  <wizardpage label=" " pageid="first" next="proxy" onextra2="onCopyLog();" - onpageshow="setTimeout(function() { showWizardNavButtons(); }, 0);"> + onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> <hbox class="tbb-header"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -52,7 +54,7 @@ </wizardpage> <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" - onpageshow="showWizardNavButtons();" + onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardProxyNext(this);"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -146,7 +148,10 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="startingTor" next="first"> +  + <wizardpage label=" " pageid="startingTor" next="notUsed" + onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> <spring flex="1" /> <hbox> <spring flex="1" /> @@ -163,7 +168,15 @@ </wizardpage> <wizardpage label=" " pageid="errorPanel" next="notUsed" + onpageshow="showWizardNavButtons(false);" onextra2="onCopyLog();"> + <spring flex="1" /> + <hbox> + <spring flex="1" /> + <description id="errorPanelMessage" flex="1"/> + <spring flex="1" /> + </hbox> + <spring flex="1" /> </wizardpage> <wizardpage class="help" label=" " pageid="bridgeHelp" next="notUsed" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2f1d619..4c922bb 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -305,13 +305,10 @@ function onBridgeTypeRadioChange() } -function showWizardNavButtons() +function showWizardNavButtons(aShowBtns) { - var curPage = getWizard().currentPage; - var isFirstPage = ("first" == curPage.pageid); - - showOrHideButton("back", !isFirstPage, false); - showOrHideButton("next", !isFirstPage && curPage.next, false); + showOrHideButton("back", aShowBtns, false); + showOrHideButton("next", aShowBtns, false); } @@ -340,7 +337,7 @@ var gObserver = { else if (kTorProcessDidNotStartTopic == aTopic) { gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); - showErrorPanel(); + showErrorPanel(aData); } else if (kTorProcessExitedTopic == aTopic) { @@ -443,18 +440,16 @@ function showStartingTorPanel(aTorExited) } showPanel("startingTor"); - var haveWizard = (getWizard() != null); - if (haveWizard) - { - showOrHideButton("back", false, false); - showOrHideButton("next", false, false); - } } -function showErrorPanel() +function showErrorPanel(aErrorMsg) { showPanel("errorPanel"); + var elem = document.getElementById("errorPanelMessage"); + if (elem) + elem.textContent = (aErrorMsg) ? aErrorMsg : ""; + var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) showCopyLogButton(haveErrorOrWarning); diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c27878c..b35eb52 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -103,6 +103,7 @@ button.firstAnswer { } wizardpage[pageid="startingTor"] description, +wizardpage[pageid="errorPanel"] description, #startingTor description { font-size: 120%; font-weight: bold; diff --git a/src/components/tl-process.js b/src/components/tl-process.js index fb795dd..2d3a3a3 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -176,8 +176,8 @@ TorProcessService.prototype = else if ((Date.now() - this.mTorProcessStartTime) > this.kControlConnTimeoutMS) { - this.mObsSvc.notifyObservers(null, "TorProcessDidNotStart", null); var s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); + this.mObsSvc.notifyObservers(null, "TorProcessDidNotStart", s); TorLauncherUtil.showAlert(null, s); TorLauncherLogger.log(4, s); }

1 0

[tor-launcher/master] Bug 11193: Change "Tor Browser Bundle" to "Tor Browser"
by brade＠torproject.org 11 Jul '14

11 Jul '14

commit 3800f076154152ca5446cd8ea8ec33a46d0b9bf4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 11 13:37:27 2014 -0400 Bug 11193: Change "Tor Browser Bundle" to "Tor Browser" Update the logo that is displayed in the network settings wizard. --- src/chrome/skin/network-settings.css | 5 +++-- src/chrome/skin/tbb-logo.png | Bin 15395 -> 20231 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index b1f7f92..c27878c 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -89,8 +89,9 @@ button.firstAnswer { .tbb-logo { list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); - width: 198px; - height: 70px; + width: 115px; + height: 80px; + margin-right: 20px; } #bridgeCustomEntry { diff --git a/src/chrome/skin/tbb-logo.png b/src/chrome/skin/tbb-logo.png index d6744ae..5499203 100644 Binary files a/src/chrome/skin/tbb-logo.png and b/src/chrome/skin/tbb-logo.png differ

1 0

[tor-browser-bundle/master] Use meek 0.9. Bump NoScript version.
by gk＠torproject.org 07 Jul '14

07 Jul '14

commit 6ce9149bfbfb25b425465e3ed5ed0d0542790d04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 7 09:17:51 2014 +0000 Use meek 0.9. Bump NoScript version. --- Bundle-Data/Docs/ChangeLog.txt | 6 +++--- gitian/versions.alpha | 8 ++++---- gitian/versions.nightly | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1e2aecd..0ea1dc2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,10 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 +Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Tor to 0.2.5.5-alpha - * Update NoScript to 2.6.8.30rc4 - * Update HTTPS Everywhere to 3.5.3 + * Update NoScript to 2.6.8.31 * Script permissions now apply based on URL bar + * Update HTTPS Everywhere to 3.5.3 * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a724e48..425bbfd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.8 +MEEK_TAG=0.9 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -49,7 +49,7 @@ GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 13f49a3..e129726 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_…

1 0

[tor-launcher/master] Bug 11471: Text does not fit the dialog size.
by brade＠torproject.org 30 Jun '14

30 Jun '14

commit 7a56563f3bc52f2031fc998c743247f43d488a9c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 16:20:38 2014 -0400 Bug 11471: Text does not fit the dialog size. Increase the progress window width slightly and allow for three lines in the description field. --- src/chrome/content/progress.xul | 4 ++-- src/chrome/skin/progress.css | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index fe85e39..473dab9 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -32,7 +32,7 @@ <spacer flex="1" /> </vbox> <separator orient="vertical" /> - <vbox> + <vbox flex="1"> <label id="progressHeading" value="&torprogress.heading;" /> <description id="progressDesc" /> </vbox> diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index 711a679..d718452 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -1,12 +1,12 @@ /* - * Copyright (c) 2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: */ dialog { - width: 370px; + width: 400px; } #progressHeading { @@ -27,7 +27,7 @@ dialog { } #progressDesc { - height: 32px; + height: 48px; } #progressMeter {

1 0

[tor-launcher/master] Bug 11471: Text does not fit the dialog size.
by brade＠torproject.org 30 Jun '14

30 Jun '14

commit c1f170510a8b8a9ad79b181f412c4355e9312056 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 11:22:59 2014 -0400 Bug 11471: Text does not fit the dialog size. This is a partial fix (network settings wizard only). Also fixed a nuisance: the torWarning CSS class was being added more than once to the "Copy Tor Log To Clipboard" button. --- src/chrome/content/network-settings.js | 66 +++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index c6b6cf2..2f1d619 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -177,10 +177,50 @@ function initDialog() showPanel(); } + // Resize this window to fit content. sizeToContent() alone will not do + // the job (it has many limitations and it is buggy). + sizeToContent(); + let w = maxWidthOfContent(); + if (w) + { + let windowFrameWidth = window.outerWidth - window.innerWidth; + w += windowFrameWidth; + + if (w > window.outerWidth) + window.resizeTo(w, window.outerHeight); + } + TorLauncherLogger.log(2, "initDialog done"); } +// For now, we assume that the wizard buttons are the widest portion. +// TODO: return a value for the settings dialog (non-wizard case). +function maxWidthOfContent() +{ + let haveWizard = (getWizard() != null); + if (!haveWizard) + return undefined; + + // Show all buttons so we can get an accurate width measurement. + // They will be hidden, as necessary, by the wizard. + let buttons = "back,next,cancel,extra2,help".split(','); + for (let i = 0; i < buttons.length; ++i) + showOrHideButton(buttons[i], true, false); + + let btn = document.documentElement.getButton("cancel"); + let btnContainer = btn.parentElement; + + const kWarningIconWidth = 20; // skin/warning.png is 16 plus some margin + let r = btnContainer.getBoundingClientRect(); + + // Hide copy log button if appropriate. + restoreCopyLogVisibility(); + + return Math.ceil((2 * r.left) + r.width + kWarningIconWidth); +} + + function getWizard() { var elem = document.getElementById("TorNetworkSettings"); @@ -434,13 +474,31 @@ function showCopyLogButton(aHaveErrorOrWarning) if (aHaveErrorOrWarning) { var clz = copyLogBtn.getAttribute("class"); - copyLogBtn.setAttribute("class", clz ? clz + " torWarning" - : "torWarning"); + if (!clz) + copyLogBtn.setAttribute("class", "torWarning"); + else if (clz.indexOf("torWarning") < 0) + copyLogBtn.setAttribute("class", clz + " torWarning"); } } } +function restoreCopyLogVisibility() +{ + if (!getWizard()) + return; + + var copyLogBtn = document.documentElement.getButton("extra2"); + if (!copyLogBtn) + return; + + if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + copyLogBtn.removeAttribute("hidden"); + else + copyLogBtn.setAttribute("hidden", true); +} + + function showOrHideButton(aID, aShow, aFocus) { var btn = setButtonAttr(aID, "hidden", !aShow); @@ -649,9 +707,7 @@ function closeHelp() { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - var copyLogBtn = document.documentElement.getButton("extra2"); - if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) - copyLogBtn.removeAttribute("hidden"); + restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0