date:20150728

[tor-commits] [torbutton/master] Bug 16268: non-en-US Tor Browser has Firefox branding in about box.

2015-07-28 Thread mikeperry

commit d7ff1cc7c2b785a2e44e2a568ae0d66a890f225b
Author: Kathy Brade br...@pearlcrescent.com
Date:   Mon Jul 27 13:40:29 2015 -0400

Bug 16268: non-en-US Tor Browser has Firefox branding in about box.

Import aboutDialog.dtd and aboutTor.properties from Transifex.
Improved import-translations.sh to check that all .dtd and
  .properties files are imported.
Work around a Transifex issue that caused some entities to be
  encoded twice.
---
 trans_tools/import-translations.sh |   88 
 1 file changed, 60 insertions(+), 28 deletions(-)

diff --git a/trans_tools/import-translations.sh 
b/trans_tools/import-translations.sh
index c29ed4c..28816ff 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # This var comes from the TBB locale list.
 # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
@@ -11,6 +11,48 @@ BUNDLE_LOCALES=ar de es fa fr it ko nl pl pt ru tr vi zh-CN
 # and translations are available.
 BUNDLE_LOCALES=$BUNDLE_LOCALES eu ja sv
 
+LOCALE_DIR=../src/chrome/locale
+
+# FILEMAP is an array of localeFile:translationBranch strings.
+FILEMAP=( aboutDialog.dtd:torbutton-aboutdialogdtd
+  aboutTor.dtd:abouttor-homepage
+  aboutTor.properties:torbutton-abouttorproperties
+  brand.dtd:torbutton-branddtd
+  brand.properties:torbutton-brandproperties
+  browser.properties:torbutton-browserproperties
+  torbutton.dtd:torbutton-torbuttondtd
+  torbutton.properties:torbutton-torbuttonproperties
+ )
+
+# Verify that the FILEMAP contains an entry for each Torbutton file.
+FILES_ARE_MISSING=0
+for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties;
+do
+  IS_FILE_IN_MAP=0
+  DEST_FILE=${DEST_PATH##*/}
+  for KEYVAL in ${FILEMAP[@]};
+  do
+FILE=${KEYVAL%%:*}
+if [ $FILE = $DEST_FILE ];
+then
+  IS_FILE_IN_MAP=1
+  break;
+fi
+  done
+
+  if [ $IS_FILE_IN_MAP -eq 0 ];
+  then
+echo Please add $DEST_FILE to FILEMAP. 12
+FILES_ARE_MISSING=1
+  fi
+done
+
+if [ $FILES_ARE_MISSING -ne 0 ];
+then
+  exit 1
+fi
+
+# Clone or update our translation repo.
 if [ -d translation ];
 then
   cd translation
@@ -20,32 +62,22 @@ else
   git clone https://git.torproject.org/translation.git
 fi
 
+# Update each translated file for each locale.
+echo Locales: $BUNDLE_LOCALES
 cd translation
-for i in $BUNDLE_LOCALES
-do
-  UL=`echo $i|tr - _`
-  mkdir -p ../../src/chrome/locale/$i/
-  git checkout abouttor-homepage
-  git merge origin/abouttor-homepage
-  cp $UL/aboutTor.dtd ../../src/chrome/locale/$i/
-
-  git checkout torbutton-torbuttondtd
-  git merge origin/torbutton-torbuttondtd
-  cp $UL/torbutton.dtd ../../src/chrome/locale/$i/
-
-  git checkout torbutton-branddtd
-  git merge origin/torbutton-branddtd
-  cp $UL/brand.dtd ../../src/chrome/locale/$i/
-
-  git checkout torbutton-torbuttonproperties
-  git merge origin/torbutton-torbuttonproperties
-  cp $UL/torbutton.properties ../../src/chrome/locale/$i/
-
-  git checkout torbutton-browserproperties
-  git merge origin/torbutton-browserproperties
-  cp $UL/browser.properties ../../src/chrome/locale/$i/
-
-  git checkout torbutton-brandproperties
-  git merge origin/torbutton-brandproperties
-  cp $UL/brand.properties ../../src/chrome/locale/$i/
+for KEYVAL in ${FILEMAP[@]}; do
+  FILE=${KEYVAL%%:*}
+  BRANCH=${KEYVAL##*:}
+  echo Updating ${FILE}...
+  git checkout -q $BRANCH
+  git merge -q origin/$BRANCH
+  for i in $BUNDLE_LOCALES;
+  do
+UL=`echo $i|tr - _`
+mkdir -p ../$LOCALE_DIR/$i/
+# Use sed to work around a Transifex double entity issue.
+sed -e 's/\amp;brandShortName;/\brandShortName;/g'   
\
+-e 's/\amp;vendorShortName;/\vendorShortName;/g' 
\
+$UL/$FILE  ../$LOCALE_DIR/$i/$FILE
+  done
 done

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #15502, Part 2: Regression tests for blob URL isolation

2015-07-28 Thread mikeperry

commit eaeb778b28d2f300403a721db8374ea72f8499b6
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Mon Jun 22 16:18:46 2015 -0700

fixup! Bug #15502, Part 2: Regression tests for blob URL isolation
---
 dom/base/test/bug15502_page_blobify.html |3 ++-
 dom/base/test/bug15502_page_deblobify.html   |3 ++-
 dom/base/test/bug15502_tab.html  |5 +++--
 dom/base/test/bug15502_utils.js  |   15 +++
 dom/base/test/bug15502_worker_blobify.html   |3 ++-
 dom/base/test/bug15502_worker_deblobify.html |3 ++-
 dom/base/test/test_tor_bug15502.html |   17 -
 7 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/dom/base/test/bug15502_page_blobify.html 
b/dom/base/test/bug15502_page_blobify.html
index d883929..5d81bec 100644
--- a/dom/base/test/bug15502_page_blobify.html
+++ b/dom/base/test/bug15502_page_blobify.html
@@ -6,6 +6,7 @@ https://bugs.torproject.org/15502
 head
   meta http-equiv=content-type content=text/html; charset=utf-8
   titlePage blobifier for Tor Browser Bug 15502/title
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
   script type=text/javascript;version=1.7 src=bug15502_utils.js/script
 /head
 body
@@ -13,7 +14,7 @@ https://bugs.torproject.org/15502
 
 script type=text/javascript;version=1.7
 
-Task.spawn(function* () {
+spawnTask(function* () {
   sendMessage(window.parent, ready);
   let message = yield receiveMessage(window.parent),
   blobURL = stringToBlobURL(message);
diff --git a/dom/base/test/bug15502_page_deblobify.html 
b/dom/base/test/bug15502_page_deblobify.html
index e8cbd51..c728c79 100644
--- a/dom/base/test/bug15502_page_deblobify.html
+++ b/dom/base/test/bug15502_page_deblobify.html
@@ -6,6 +6,7 @@ https://bugs.torproject.org/15502
 head
   meta http-equiv=content-type content=text/html; charset=utf-8
   titlePage deblobifier for Tor Browser Bug 15502/title
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
   script type=text/javascript;version=1.7 src=bug15502_utils.js/script
 /head
 body
@@ -13,7 +14,7 @@ https://bugs.torproject.org/15502
 
 script type=text/javascript;version=1.7
 
-Task.spawn(function* () {
+spawnTask(function* () {
   sendMessage(window.parent, ready);
   let blobURL = yield receiveMessage(window.parent),
   string;
diff --git a/dom/base/test/bug15502_tab.html b/dom/base/test/bug15502_tab.html
index 7bd4744..b41274e 100644
--- a/dom/base/test/bug15502_tab.html
+++ b/dom/base/test/bug15502_tab.html
@@ -6,6 +6,7 @@ https://bugs.torproject.org/15502
 head
   meta http-equiv=content-type content=text/html; charset=utf-8
   titleTab for Tor Browser Bug 15502/title
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
   script type=text/javascript;version=1.7 src=bug15502_utils.js/script
 /head
 body
@@ -18,7 +19,7 @@ https://bugs.torproject.org/15502
 let iframe = document.getElementById(child);
 
 let connect = function (sourceObject, destinationObject) {
-  Task.spawn(function* () {
+  spawnTask(function* () {
 for (;;) {
   let message = yield receiveMessage(sourceObject);
   sendMessage(destinationObject, message);
@@ -26,7 +27,7 @@ let connect = function (sourceObject, destinationObject) {
   });
 };
 
-Task.spawn(function* () {
+spawnTask(function* () {
   sendMessage(window.opener, ready);
   let firstParentMessage = yield receiveMessage(window.opener);
   iframe.src = firstParentMessage;
diff --git a/dom/base/test/bug15502_utils.js b/dom/base/test/bug15502_utils.js
index 9d69c12..23f61c4 100644
--- a/dom/base/test/bug15502_utils.js
+++ b/dom/base/test/bug15502_utils.js
@@ -1,11 +1,8 @@
-// Import Task.jsm
-let { Task } = SpecialPowers.Cu.import(resource://gre/modules/Task.jsm);
-
 // __listen(target, eventType, timeoutMs, useCapture)__.
 // Calls addEventListener on target, with the given eventType.
 // Returns a Promise that resolves to an Event object, if the event fires.
 // If a timeout occurs, then Promise is rejected with a Timed out error.
-// For use with Task.jsm.
+// For use with SpawnTask.js.
 let listen = function (target, eventType, timeoutMs, useCapture) {
   return new Promise(function (resolve, reject) {
 let listenFunction = function (event) {
@@ -13,17 +10,19 @@ let listen = function (target, eventType, timeoutMs, 
useCapture) {
   resolve(event);
 };
 target.addEventListener(eventType, listenFunction, useCapture);
-setTimeout(() = reject(new Error(Timed out)), timeoutMs);
+if (timeoutMs) {
+  setTimeout(() = reject(new Error(Timed out)), timeoutMs);
+}
   });
 };
 
 // __receiveMessage(source)__.
 // Returns an event object for the next message received from source.
-// A Task.jsm coroutine.
+// A SpawnTask.js coroutine.
 let receiveMessage = function* (source) {
   let event;
   do {
-event = yield listen(self, message, 5000, false);
+event = yield listen(self, message, null, false);
   } while (event.source !==

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #15502. Isolate blob, mediasource mediastream URLs to first party

2015-07-28 Thread mikeperry

commit f538052047ad61cf74f926381bc7c41b60fa2a3d
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 2 12:56:23 2015 -0700

Bug #15502. Isolate blob, mediasource  mediastream URLs to first party

This patch handles blob URLs created and retrieved in Web Workers.

See also #15703 and #16429.
---
 dom/base/ThirdPartyUtil.cpp  |   21 ++
 dom/base/ThirdPartyUtil.h|   12 +++
 dom/base/URL.cpp |   32 +---
 dom/base/moz.build   |1 +
 dom/base/nsDocument.cpp  |   17 -
 dom/base/nsHostObjectProtocolHandler.cpp |  120 ++
 dom/base/nsHostObjectProtocolHandler.h   |   15 ++--
 dom/fetch/Fetch.cpp  |   17 -
 dom/fetch/FetchDriver.cpp|8 +-
 dom/fetch/FetchDriver.h  |5 +-
 dom/html/HTMLMediaElement.cpp|   17 -
 dom/media/MediaResource.cpp  |6 +-
 dom/workers/URL.cpp  |   21 +-
 dom/workers/WorkerPrivate.cpp|   22 +-
 14 files changed, 232 insertions(+), 82 deletions(-)

diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
index d0aed3a..e8ec06c 100644
--- a/dom/base/ThirdPartyUtil.cpp
+++ b/dom/base/ThirdPartyUtil.cpp
@@ -33,6 +33,27 @@ static PRLogModuleInfo *gThirdPartyLog;
 #undef LOG
 #define LOG(args) PR_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)
 
+// static
+mozIThirdPartyUtil* ThirdPartyUtil::gThirdPartyUtilService = nullptr;
+
+//static
+nsresult
+ThirdPartyUtil::GetFirstPartyHost(nsIChannel* aChannel, nsIDocument* 
aDocument, nsACString aResult)
+{
+  if (!gThirdPartyUtilService) {
+CallGetService(THIRDPARTYUTIL_CONTRACTID, gThirdPartyUtilService);
+  }
+  nsCOMPtrnsIURI isolationURI;
+  nsresult rv = gThirdPartyUtilService-GetFirstPartyIsolationURI(aChannel, 
aDocument, getter_AddRefs(isolationURI));
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!isolationURI) {
+// Isolation is not active.
+aResult.Truncate();
+return NS_OK;
+  }
+  return gThirdPartyUtilService-GetFirstPartyHostForIsolation(isolationURI, 
aResult);
+}
+
 nsresult
 ThirdPartyUtil::Init()
 {
diff --git a/dom/base/ThirdPartyUtil.h b/dom/base/ThirdPartyUtil.h
index c03740e..77e73f7 100644
--- a/dom/base/ThirdPartyUtil.h
+++ b/dom/base/ThirdPartyUtil.h
@@ -24,6 +24,18 @@ public:
 
   nsresult Init();
 
+  static mozIThirdPartyUtil* gThirdPartyUtilService;
+
+  static nsresult GetFirstPartyHost(nsIChannel* aChannel, nsIDocument* 
aDocument, nsACString aResult);
+
+  static nsresult GetFirstPartyHost(nsIChannel* aChannel, nsACString aResult) 
{
+return GetFirstPartyHost(aChannel, nullptr, aResult);
+  }
+
+  static nsresult GetFirstPartyHost(nsIDocument* aDocument, nsACString 
aResult) {
+return GetFirstPartyHost(nullptr, aDocument, aResult);
+  }
+
 private:
   ~ThirdPartyUtil() {}
 
diff --git a/dom/base/URL.cpp b/dom/base/URL.cpp
index fea8dd2..1931c28 100644
--- a/dom/base/URL.cpp
+++ b/dom/base/URL.cpp
@@ -17,6 +17,7 @@
 #include nsNetCID.h
 #include nsNetUtil.h
 #include nsIURL.h
+#include ThirdPartyUtil.h
 
 namespace mozilla {
 namespace dom {
@@ -152,12 +153,6 @@ URL::CreateObjectURLInternal(const GlobalObject aGlobal, 
nsISupports* aObject,
   nsCOMPtrnsIPrincipal principal = 
nsContentUtils::ObjectPrincipal(aGlobal.Get());
 
   nsCString url;
-  nsresult rv = nsHostObjectProtocolHandler::AddDataEntry(aScheme, aObject,
-  principal, url);
-  if (NS_FAILED(rv)) {
-aError.Throw(rv);
-return;
-  }
 
   nsCOMPtrnsPIDOMWindow w = do_QueryInterface(aGlobal.GetAsSupports());
   nsGlobalWindow* window = static_castnsGlobalWindow*(w.get());
@@ -172,6 +167,18 @@ URL::CreateObjectURLInternal(const GlobalObject aGlobal, 
nsISupports* aObject,
 
 nsIDocument* doc = window-GetExtantDoc();
 if (doc) {
+  nsCString isolationKey;
+  nsresult rv = ThirdPartyUtil::GetFirstPartyHost(doc, isolationKey);
+  if (NS_FAILED(rv)) {
+aError.Throw(rv);
+return;
+  }
+  rv = nsHostObjectProtocolHandler::AddDataEntry(aScheme, aObject,
+  principal, 
isolationKey, url);
+  if (NS_FAILED(rv)) {
+aError.Throw(rv);
+return;
+  }
   doc-RegisterHostObjectUri(url);
 }
   }
@@ -193,10 +200,17 @@ URL::RevokeObjectURL(const GlobalObject aGlobal, const 
nsAString aURL)
 nsCOMPtrnsPIDOMWindow w = do_QueryInterface(aGlobal.GetAsSupports());
 nsGlobalWindow* window = static_castnsGlobalWindow*(w.get());
 
-if (window  window-GetExtantDoc()) {
-  window-GetExtantDoc()-UnregisterHostObjectUri(asciiurl);
+if (window) {
+  nsCOMPtrnsIDocument doc = window-GetExtantDoc();
+  if (doc) {
+doc-UnregisterHostObjectUri(asciiurl);
+nsCString isolationKey;
+nsresult rv = ThirdPartyUtil::GetFirstPartyHost(doc,

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #15703: Regression tests for isolation of mediasource URI

2015-07-28 Thread mikeperry

commit 2ae052be0e0cdcba4df89607002233ad3d1e6f11
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 2 16:28:36 2015 -0700

Bug #15703: Regression tests for isolation of mediasource URI
---
 dom/base/test/bug15703_page_create.html   |   28 +
 dom/base/test/bug15703_page_retrieve.html |   50 
 dom/base/test/mochitest.ini   |3 +
 dom/base/test/test_tor_bug15703.html  |   92 +
 4 files changed, 173 insertions(+)

diff --git a/dom/base/test/bug15703_page_create.html 
b/dom/base/test/bug15703_page_create.html
new file mode 100644
index 000..2325e6f
--- /dev/null
+++ b/dom/base/test/bug15703_page_create.html
@@ -0,0 +1,28 @@
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15703
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titlePage mediasource URI creator for Tor Browser Bug 15703/title
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+/head
+body
+div id=display style=white-space:pre; font-family:monospace; 
display:inline;/div
+
+script type=text/javascript;version=1.7
+
+spawnTask(function* () {
+  sendMessage(window.parent, ready);
+  let message = yield receiveMessage(window.parent),
+  mediaSource = new MediaSource(),
+  mediaSourceURL = URL.createObjectURL(mediaSource);
+  sendMessage(window.parent, mediaSourceURL);
+  appendLine(display, message +  -  + mediaSourceURL);
+});
+
+/script
+/body
+/html
diff --git a/dom/base/test/bug15703_page_retrieve.html 
b/dom/base/test/bug15703_page_retrieve.html
new file mode 100644
index 000..de3e14f
--- /dev/null
+++ b/dom/base/test/bug15703_page_retrieve.html
@@ -0,0 +1,50 @@
+
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15502
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titlePage mediaSource retriever for Tor Browser Bug 15703/title
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+/head
+body
+div id=display style=white-space:pre; font-family:monospace; 
display:inline;/div
+video id=testvideo/video
+script type=text/javascript;version=1.7
+
+let reportResult = function(mediaSourceURL, message) {
+  sendMessage(window.parent, message);
+  appendLine(display, mediaSourceURL +  -  + message);
+};
+
+spawnTask(function* () {
+  // Tell the parent tab we are ready to start.
+  sendMessage(window.parent, ready);
+  // Receive a mediaSourceURL. In a moment, we will
+  // use a video element to attempt to implicitly load
+  // the MediaSource object at this URL.
+  let mediaSourceURL = yield receiveMessage(window.parent);
+  // First create the video element.
+  let videoElement = document.getElementById(testvideo);
+  // If we are not able to load a MediaSource object
+  // at mediaSourceURL, then an error event will occur.
+  videoElement.addEventListener(error, function (e) {
+reportResult(mediaSourceURL, setting videoElement.src failed);
+  });
+  // If we do find a MediaSource object at mediaSourceURL,
+  // then a stalled event will occur, because the object
+  // has been found, but contains no content.
+  videoElement.addEventListener(stalled, function (e) {
+reportResult(mediaSourceURL, retrieved);
+  });
+  // Now attempt to load a MediaSource object by setting
+  // the video element's src to mediaSourceURL.
+  videoElement.src = mediaSourceURL;
+});
+
+/script
+/body
+/html
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index dc5dfef..133348e 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -31,6 +31,8 @@ support-files =
   bug15502_worker_blobify.html
   bug15502_worker_deblobify.js
   bug15502_worker_deblobify.html
+  bug15703_page_create.html
+  bug15703_page_retrieve.html
   bug282547.sjs
   bug298064-subframe.html
   bug313646.txt
@@ -736,6 +738,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM
 [test_textnode_split_in_selection.html]
 [test_title.html]
 [test_tor_bug15502.html]
+[test_tor_bug15703.html]
 [test_treewalker_nextsibling.xml]
 [test_viewport_scroll.html]
 [test_viewsource_forbidden_in_object.html]
diff --git a/dom/base/test/test_tor_bug15703.html 
b/dom/base/test/test_tor_bug15703.html
new file mode 100644
index 000..a0d3ae1
--- /dev/null
+++ b/dom/base/test/test_tor_bug15703.html
@@ -0,0 +1,92 @@
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15703
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleTest for Tor Browser Bug 15703/title
+  script type=text/javascript 
src=/tests/SimpleTest/SimpleTest.js/script
+  script type=text/javascript src=/tests/SimpleTest/SpawnTask.js/script
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+  link rel=stylesheet type=text/css href=/tests/SimpleTest/test.css /
+/head
+body
+p id=display/p
+div

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 1078657 - Add SpawnTask.js for async tasks in mochitests. r=jmaher

2015-07-28 Thread mikeperry

commit 6bc7fec8c4381a2ed4112ab9c43a6b243c6a0dd5
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Fri Jul 17 12:37:24 2015 -0400

Bug 1078657 - Add SpawnTask.js for async tasks in mochitests. r=jmaher
---
 testing/mochitest/chrome/chrome.ini|1 +
 testing/mochitest/chrome/test_sanitySpawnTask.xul  |   70 ++
 testing/mochitest/jar.mn   |1 +
 .../mochitest/tests/Harness_sanity/mochitest.ini   |2 +-
 .../tests/Harness_sanity/test_spawn_task.html  |   73 ++
 .../mochitest/tests/SimpleTest/LICENSE_SpawnTask   |   24 ++
 testing/mochitest/tests/SimpleTest/SpawnTask.js|  244 
 testing/mochitest/tests/SimpleTest/moz.build   |1 +
 8 files changed, 415 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/chrome/chrome.ini 
b/testing/mochitest/chrome/chrome.ini
index ecd3911..a5ed449 100644
--- a/testing/mochitest/chrome/chrome.ini
+++ b/testing/mochitest/chrome/chrome.ini
@@ -12,4 +12,5 @@ skip-if = buildapp == 'mulet'
 fail-if = true
 [test_sanityManifest_pf.xul]
 fail-if = true
+[test_sanitySpawnTask.xul]
 [test_chromeGetTestFile.xul]
diff --git a/testing/mochitest/chrome/test_sanitySpawnTask.xul 
b/testing/mochitest/chrome/test_sanitySpawnTask.xul
new file mode 100644
index 000..c26b761
--- /dev/null
+++ b/testing/mochitest/chrome/test_sanitySpawnTask.xul
@@ -0,0 +1,70 @@
+?xml version=1.0?
+!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. --
+?xml-stylesheet href=chrome://mochikit/content/tests/SimpleTest/test.css
+ type=text/css?
+window title=Test spawnTawk function
+xmlns=http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul;
+  script type=application/javascript
+  src=chrome://mochikit/content/tests/SimpleTest/SimpleTest.js/
+  script type=application/javascript
+  src=chrome://mochikit/content/tests/SimpleTest/SpawnTask.js/
+  script type=application/javascript
+  ![CDATA[
+SimpleTest.waitForExplicitFinish();
+
+var externalGeneratorFunction = function* () {
+  return 8;
+};
+
+var nestedFunction = function* () {
+  return yield function* () {
+return yield function* () {
+  return yield function* () {
+return yield Promise.resolve(9);
+  }();
+}();
+  }();
+}
+
+var variousTests = function* () {
+  var val1 = yield [Promise.resolve(1), Promise.resolve(2), 
Promise.resolve(3)];
+  is(val1.join(), 123, Array of promises - Promise.all);
+  var val2 = yield Promise.resolve(2);
+  is(val2, 2, Resolved promise yields value.);
+  var val3 = yield function* () { return 3; };
+  is(val3, 3, Generator functions are spawned.);
+  //var val4 = yield function () { return 4; };
+  //is(val4, 4, Plain functions run and return.);
+  var val5 = yield (function* () { return 5; }());
+  is(val5, 5, Generators are spawned.);
+  try {
+var val6 = yield Promise.reject(Error(error6));
+ok(false, Shouldn't reach this line.);
+  } catch (error) {
+is(error.message, error6, Rejected promise throws error.);
+  }
+  try {
+var val7 = yield function* () { throw Error(error7); };
+ok(false, Shouldn't reach this line.);
+  } catch (error) {
+is(error.message, error7, Thrown error propagates.);
+  }
+  var val8 = yield externalGeneratorFunction();
+  is(val8, 8, External generator also spawned.);
+  var val9 = yield nestedFunction();
+  is(val9, 9, Nested generator functions work.);
+  return 10;
+};
+
+spawnTask(variousTests).then(function(result) {
+  is(result, 10, spawnTask(...) returns promise);
+  SimpleTest.finish();
+});
+]]
+  /script
+
+  body xmlns=http://www.w3.org/1999/xhtml; 
+  /body
+/window
diff --git a/testing/mochitest/jar.mn b/testing/mochitest/jar.mn
index c678812..75f535d 100644
--- a/testing/mochitest/jar.mn
+++ b/testing/mochitest/jar.mn
@@ -20,6 +20,7 @@ mochikit.jar:
   content/static/harness.css (static/harness.css)
   content/tests/SimpleTest/ChromePowers.js (tests/SimpleTest/ChromePowers.js)
   content/tests/SimpleTest/EventUtils.js (tests/SimpleTest/EventUtils.js)
+  content/tests/SimpleTest/SpawnTask.js (tests/SimpleTest/SpawnTask.js)
   content/tests/SimpleTest/ChromeUtils.js (tests/SimpleTest/ChromeUtils.js)
   content/tests/SimpleTest/LogController.js (tests/SimpleTest/LogController.js)
   content/tests/SimpleTest/MemoryStats.js (tests/SimpleTest/MemoryStats.js)
diff --git a/testing/mochitest/tests/Harness_sanity/mochitest.ini 
b/testing/mochitest/tests/Harness_sanity/mochitest.ini
index 0eefc3f..935acc3 100644
--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -31,4 +31,4 @@

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Revert Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers

2015-07-28 Thread mikeperry

commit b4d97bc75ff672725fd80e0c640748a74c6edc3e
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 2 12:54:18 2015 -0700

Revert Bug #15502. Isolate blob URLs to first party; no blobURLs in Web 
Workers

This reverts commit 7a8d11b1ef502688c97d7900c57361c4be6ae13a.
---
 .../pdfjs/content/PdfStreamConverter.jsm   |7 +-
 .../extensions/pdfjs/content/build/pdf.worker.js   |9 +---
 dom/base/ThirdPartyUtil.cpp|9 
 dom/base/nsHostObjectProtocolHandler.cpp   |   23 ++--
 dom/workers/URL.cpp|7 --
 netwerk/base/mozIThirdPartyUtil.idl|   14 
 6 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm 
b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
index 26515be..11db211 100644
--- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
@@ -250,12 +250,6 @@ ChromeActions.prototype = {
   filename = 'document.pdf';
 }
 var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
-var netChannel;
-try {
-  netChannel = NetUtil.newChannel(blobUri);
-} catch (e) {
-  netChannel = NetUtil.newChannel(originalUri);
-}
 var extHelperAppSvc =
   Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
  getService(Ci.nsIExternalHelperAppService);
@@ -263,6 +257,7 @@ ChromeActions.prototype = {
  getService(Ci.nsIWindowWatcher).activeWindow;
 
 var docIsPrivate = this.isInPrivateBrowsing();
+var netChannel = NetUtil.newChannel(blobUri);
 if ('nsIPrivateBrowsingChannel' in Ci 
 netChannel instanceof Ci.nsIPrivateBrowsingChannel) {
   netChannel.setPrivate(docIsPrivate);
diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js 
b/browser/extensions/pdfjs/content/build/pdf.worker.js
index a5dfe2f..c9de2ea 100644
--- a/browser/extensions/pdfjs/content/build/pdf.worker.js
+++ b/browser/extensions/pdfjs/content/build/pdf.worker.js
@@ -1152,14 +1152,7 @@ PDFJS.createObjectURL = (function 
createObjectURLClosure() {
 if (!PDFJS.disableCreateObjectURL 
 typeof URL !== 'undefined'  URL.createObjectURL) {
   var blob = PDFJS.createBlob(data, contentType);
-  try {
-return URL.createObjectURL(blob);
-  } catch(e) {
-// URL.createObjectURL has thrown an error; continue to
-// data schema fallback.
-// TODO: Remove this try-catch when we re-enable
-// createObjectURL in workers.
-  }
+  return URL.createObjectURL(blob);
 }
 
 var buffer = 'data:' + contentType + ';base64,';
diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
index eb09b43..d0aed3a 100644
--- a/dom/base/ThirdPartyUtil.cpp
+++ b/dom/base/ThirdPartyUtil.cpp
@@ -746,12 +746,3 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI 
*aFirstPartyURI,
   aHost.Append(--);
   return NS_OK;
 }
-
-NS_IMETHODIMP
-ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString aHost) {
-  nsCOMPtrnsIURI uri;
-  nsresult rv = GetFirstPartyIsolationURI(nullptr,
- nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return GetFirstPartyHostForIsolation(uri, aHost);
-}
diff --git a/dom/base/nsHostObjectProtocolHandler.cpp 
b/dom/base/nsHostObjectProtocolHandler.cpp
index 8c440f4..aac33f9 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -16,7 +16,6 @@
 #include mozilla/dom/File.h
 #include mozilla/Preferences.h
 #include mozilla/LoadInfo.h
-#include mozIThirdPartyUtil.h
 
 using mozilla::dom::FileImpl;
 using mozilla::ErrorResult;
@@ -30,20 +29,9 @@ struct DataInfo
   nsCOMPtrnsISupports mObject;
   nsCOMPtrnsIPrincipal mPrincipal;
   nsCString mStack;
-  nsCString mFirstPartyHost;
 };
 
 static nsClassHashtablensCStringHashKey, DataInfo* gDataTable;
-static nsCOMPtrmozIThirdPartyUtil gThirdPartyUtilService;
-
-static nsCString GetFirstPartyHostFromCaller() {
-  if (!gThirdPartyUtilService) {
-gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID);
-  }
-  nsCString host;
-  gThirdPartyUtilService-GetFirstPartyHostFromCaller(host);
-  return host;
-}
 
 // Memory reporting for the hash table.
 namespace mozilla {
@@ -325,8 +313,6 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString 
aScheme,
 
   info-mObject = aObject;
   info-mPrincipal = aPrincipal;
-  // Record the first party host that originated this object.
-  info-mFirstPartyHost = GetFirstPartyHostFromCaller();
   mozilla::BlobURLsReporter::GetJSStackForBlob(info);
 
   gDataTable-Put(aUri, info);
@@ -451,10 +437,7 @@ GetDataObject(nsIURI* aURI)
   aURI-GetSpec(spec);
 
   DataInfo* info = GetDataInfo(spec);
-  // Deny access to this object if the current first-party

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2015-07-28 Thread translation

commit 4606fe50aab1a109a72808f69780a485d5751490
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 09:19:03 2015 +

Update translations for tor-messenger-ircproperties
---
 ach/irc.properties |4 
 ady/irc.properties |4 
 af/irc.properties  |4 
 ak/irc.properties  |4 
 am/irc.properties  |4 
 ar/irc.properties  |4 
 arn/irc.properties |4 
 ast/irc.properties |4 
 az/irc.properties  |4 
 ba/irc.properties  |4 
 be/irc.properties  |4 
 bg/irc.properties  |4 
 bn/irc.properties  |4 
 bn_IN/irc.properties   |4 
 bo/irc.properties  |4 
 br/irc.properties  |4 
 bs/irc.properties  |4 
 ca/irc.properties  |4 
 cs/irc.properties  |4 
 csb/irc.properties |4 
 cv/irc.properties  |4 
 cy/irc.properties  |4 
 cy_GB/irc.properties   |4 
 da/irc.properties  |4 
 de/irc.properties  |4 
 dz/irc.properties  |4 
 el/irc.properties  |4 
 en/irc.properties  |4 
 en_GB/irc.properties   |4 
 eo/irc.properties  |4 
 es/irc.properties  |4 
 es_AR/irc.properties   |4 
 es_CL/irc.properties   |4 
 es_CO/irc.properties   |4 
 es_MX/irc.properties   |4 
 et/irc.properties  |4 
 eu/irc.properties  |4 
 fa/irc.properties  |4 
 fi/irc.properties  |4 
 fil/irc.properties |4 
 fo/irc.properties  |4 
 fr/irc.properties  |4 
 fr_CA/irc.properties   |4 
 fur/irc.properties |4 
 fy/irc.properties  |4 
 ga/irc.properties  |4 
 gd/irc.properties  |4 
 gl/irc.properties  |4 
 gu/irc.properties  |4 
 gu_IN/irc.properties   |4 
 gun/irc.properties |4 
 ha/irc.properties  |4 
 he/irc.properties  |4 
 hi/irc.properties  |4 
 hr/irc.properties  |4 
 hr_HR/irc.properties   |4 
 ht/irc.properties  |4 
 hu/irc.properties  |4 
 hy/irc.properties  |4 
 hy_AM/irc.properties   |4 
 ia/irc.properties  |4 
 id/irc.properties  |4 
 is/irc.properties  |4 
 it/irc.properties  |4 
 ja/irc.properties  |4 
 jbo/irc.properties |4 
 jv/irc.properties  |4 
 ka/irc.properties  |4 
 kk/irc.properties  |4 
 km/irc.properties  |4 
 kn/irc.properties  |4 
 ko/irc.properties  |4 
 ko_KR/irc.properties   |4 
 ku/irc.properties  |4 
 ku_IQ/irc.properties   |4 
 kw/irc.properties  |4 
 ky/irc.properties  |4 
 la/irc.properties  |4 
 lb/irc.properties  |4 
 lg/irc.properties  |4 
 ln/irc.properties  |4 
 lo/irc.properties  |4 
 lt/irc.properties  |4 
 lv/irc.properties  |4 
 mg/irc.properties  |4 
 mi/irc.properties  |4 
 mk/irc.properties  |4 
 ml/irc.properties  |4 
 mn/irc.properties  |4 
 mr/irc.properties  |4 
 ms_MY/irc.properties   |4 
 mt/irc.properties  |4 
 my/irc.properties  |4 
 nah/irc.properties |4 
 nap/irc.properties |4 
 nb/irc.properties  |4 
 nds/irc.properties |4 
 ne/irc.properties  |4 
 nl/irc.properties  |4 
 nl_BE/irc.properties   |4 
 nn/irc.properties  |4 
 nso/irc.properties |4 
 oc/irc.properties  |4 
 or/irc.properties  |4 
 pa/irc.properties  |4 
 pap/irc.properties |4 
 pl/irc.properties  |4 
 pms/irc.properties |4 
 ps/irc.properties  |4 
 pt/irc.properties  |4 
 pt_BR/irc.properties   |4 
 ro/irc.properties  |4 
 ru/irc.properties  |4 
 ru@petr1708/irc.properties |4 
 sa/irc.properties  |4 
 scn/irc.properties |4 
 sco/irc.properties |4 
 si/irc.properties  |4 
 si_LK/irc.properties   |4 
 sk/irc.properties  |

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2015-07-28 Thread translation

commit 603275c0193e5c25088e8749ea2811ba9a26a491
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 09:19:06 2015 +

Update translations for tor-messenger-ircproperties_completed
---
 en/irc.properties |4 
 1 file changed, 4 insertions(+)

diff --git a/en/irc.properties b/en/irc.properties
index 3fd93d9..ec61335 100644
--- a/en/irc.properties
+++ b/en/irc.properties
@@ -96,6 +96,10 @@ message.usermode=Mode %1$S for %2$S set by %3$S.
 message.channelmode=Channel mode %1$S set by %2$S.
 #%S is the user's mode.
 message.yourmode=Your mode is %S.
+#%1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S is now known as %2$S.
+#%S is your new nick.
+message.nick.you=You are now known as %S.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=Could not use the desired nickname. Your nick remains %S.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #15502, Part 2: Regression tests for blob URL isolation

2015-07-28 Thread mikeperry

commit 4ef8f72964d1608a9ded427137d66547f78d71b8
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 2 12:26:40 2015 -0700

fixup! Bug #15502, Part 2: Regression tests for blob URL isolation
---
 dom/base/test/test_tor_bug15502.html |   16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/dom/base/test/test_tor_bug15502.html 
b/dom/base/test/test_tor_bug15502.html
index 18b8459..05173d9 100644
--- a/dom/base/test/test_tor_bug15502.html
+++ b/dom/base/test/test_tor_bug15502.html
@@ -59,20 +59,10 @@ let blobTest = function* (isolationOn, domainA, domainB, 
blobPage, deblobPage) {
   blobURL = yield tabIO(domainA, blobPage, input),
   result = yield tabIO(domainB, deblobPage, blobURL),
   description = domainA + : + blobPage + - + domainB + : + 
deblobPage + , isolation  + (isolationOn ? on. : off.);
-  if (blobPage === worker_blob) {
-// Remove this case when we write a patch that properly isolates web 
worker blob URLs
-// by first party domain.
-ok(blobURL.contains(Permission to call 'URL.createObjectURL' denied.), 
description +  Deny blob URL creation in web worker);
-  } else if (deblobPage === worker_deblob  isolationOn) {
-// Remove this case when we write a patch that properly isolates web 
worker blob URLs
-// by first party domain.
-ok(result.contains(Access to restricted URI denied), description +  
Isolated blobs not available to web workers);
+  if (isolationOn  domainA !== domainB) {
+ok(input !== result, description +  Deny retrieval);
   } else {
-if (isolationOn  domainA !== domainB) {
-  ok(input !== result, description +  Deny retrieval);
-} else {
-  ok(input === result, description +  Allow retrieval);
-}
+ok(input === result, description +  Allow retrieval);
   }
 };
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/16429+11' into tor-browser-38.1.0esr-5.0-1

2015-07-28 Thread mikeperry

commit 2d817309e07d1e5d7eb7c6e2546c0e6793c53739
Merge: 5ba1b34 2ae052b
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 28 01:37:07 2015 -0700

Merge remote-tracking branch 'arthur/16429+11' into 
tor-browser-38.1.0esr-5.0-1

 .../pdfjs/content/PdfStreamConverter.jsm   |7 +-
 .../extensions/pdfjs/content/build/pdf.worker.js   |9 +-
 dom/base/ThirdPartyUtil.cpp|   30 ++-
 dom/base/ThirdPartyUtil.h  |   12 +
 dom/base/URL.cpp   |   32 ++-
 dom/base/moz.build |1 +
 dom/base/nsDocument.cpp|   17 +-
 dom/base/nsHostObjectProtocolHandler.cpp   |  125 +-
 dom/base/nsHostObjectProtocolHandler.h |   15 +-
 dom/base/test/bug15502_page_blobify.html   |3 +-
 dom/base/test/bug15502_page_deblobify.html |3 +-
 dom/base/test/bug15502_tab.html|5 +-
 dom/base/test/bug15502_utils.js|   15 +-
 dom/base/test/bug15502_worker_blobify.html |3 +-
 dom/base/test/bug15502_worker_deblobify.html   |3 +-
 dom/base/test/bug15703_page_create.html|   28 +++
 dom/base/test/bug15703_page_retrieve.html  |   50 
 dom/base/test/mochitest.ini|3 +
 dom/base/test/test_tor_bug15502.html   |   33 ++-
 dom/base/test/test_tor_bug15703.html   |   92 
 dom/fetch/Fetch.cpp|   17 +-
 dom/fetch/FetchDriver.cpp  |8 +-
 dom/fetch/FetchDriver.h|5 +-
 dom/html/HTMLMediaElement.cpp  |   17 +-
 dom/media/MediaResource.cpp|6 +-
 dom/workers/URL.cpp|   28 ++-
 dom/workers/WorkerPrivate.cpp  |   22 +-
 netwerk/base/mozIThirdPartyUtil.idl|   14 --
 testing/mochitest/chrome/chrome.ini|1 +
 testing/mochitest/chrome/test_sanitySpawnTask.xul  |   70 ++
 testing/mochitest/jar.mn   |1 +
 .../mochitest/tests/Harness_sanity/mochitest.ini   |2 +-
 .../tests/Harness_sanity/test_spawn_task.html  |   73 ++
 .../mochitest/tests/SimpleTest/LICENSE_SpawnTask   |   24 ++
 testing/mochitest/tests/SimpleTest/SpawnTask.js|  244 
 testing/mochitest/tests/SimpleTest/moz.build   |1 +
 36 files changed, 848 insertions(+), 171 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed

2015-07-28 Thread translation

commit 10968da793f4125a6d17bde56c02fd2f21587261
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 09:17:37 2015 +

Update translations for tor-messenger-conversationsproperties_completed
---
 de/conversations.properties|   11 ---
 en/conversations.properties|   11 ---
 es/conversations.properties|   11 ---
 fr/conversations.properties|   11 ---
 fr_CA/conversations.properties |   11 ---
 hu/conversations.properties|   11 ---
 it/conversations.properties|   11 ---
 pt_BR/conversations.properties |   11 ---
 ru/conversations.properties|   11 ---
 tr/conversations.properties|   11 ---
 zh_CN/conversations.properties |   11 ---
 11 files changed, 121 deletions(-)

diff --git a/de/conversations.properties b/de/conversations.properties
index e282790..313e6ab 100644
--- a/de/conversations.properties
+++ b/de/conversations.properties
@@ -56,17 +56,6 @@ topicChanged=%1$S hat das Thema geÃ¤ndert auf: %2$S.
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S hat das Thema geleert.
 
-# LOCALIZATION NOTE (nickSet):
-#   This is displayed as a system message when a participant changes his/her
-#   nickname in a conversation.
-#   %1$S is the old nick.
-#   %2$S is the new nick.
-nickSet=%1$S ist nun bekannt als %2$S.
-# LOCALIZATION NOTE (nickSet.you):
-#   This is displayed as a system message when your nickname is changed.
-#   %S is your new nick.
-nickSet.you=Sie sind nun bekannt als %S.
-
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut
 messenger.conversations.selections.ellipsis=[â¦]
diff --git a/en/conversations.properties b/en/conversations.properties
index 1a5564a..19b5aca 100644
--- a/en/conversations.properties
+++ b/en/conversations.properties
@@ -56,17 +56,6 @@ topicChanged=%1$S has changed the topic to: %2$S.
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S has cleared the topic.
 
-# LOCALIZATION NOTE (nickSet):
-#   This is displayed as a system message when a participant changes his/her
-#   nickname in a conversation.
-#   %1$S is the old nick.
-#   %2$S is the new nick.
-nickSet=%1$S is now known as %2$S.
-# LOCALIZATION NOTE (nickSet.you):
-#   This is displayed as a system message when your nickname is changed.
-#   %S is your new nick.
-nickSet.you=You are now known as %S.
-
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut
 messenger.conversations.selections.ellipsis=[â¦]
diff --git a/es/conversations.properties b/es/conversations.properties
index 1f72754..21590f6 100644
--- a/es/conversations.properties
+++ b/es/conversations.properties
@@ -56,17 +56,6 @@ topicChanged=%1$S ha cambiado el tema a: %2$S.
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S ha dejado el tema en blanco.
 
-# LOCALIZATION NOTE (nickSet):
-#   This is displayed as a system message when a participant changes his/her
-#   nickname in a conversation.
-#   %1$S is the old nick.
-#   %2$S is the new nick.
-nickSet=%1$S es conocido como %2$S.
-# LOCALIZATION NOTE (nickSet.you):
-#   This is displayed as a system message when your nickname is changed.
-#   %S is your new nick.
-nickSet.you=Usted es conocido como %S.
-
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut
 messenger.conversations.selections.ellipsis=[â¦]
diff --git a/fr/conversations.properties b/fr/conversations.properties
index 8ec148b..7469647 100644
--- a/fr/conversations.properties
+++ b/fr/conversations.properties
@@ -56,17 +56,6 @@ topicChanged=%1$S a changÃ© le sujet en : %2$S.
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S a effacÃ© le sujet.
 
-# LOCALIZATION NOTE (nickSet):
-#   This is displayed as a system message when a participant changes his/her
-#   nickname in a conversation.
-#   %1$S is the old nick.
-#   %2$S is the new nick.
-nickSet=%1$S s'appelle maintenant %2$S.
-# LOCALIZATION NOTE (nickSet.you):
-#   This is displayed as a system message when your nickname is changed.
-#   %S is your new nick.
-nickSet.you=Vous vous appelez dorÃ©navant %S.
-
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut
 messenger.conversations.selections.ellipsis=[â¦]
diff --git a/fr_CA/conversations.properties b/fr_CA/conversations.properties
index 05a78ab..c324159 100644
--- a/fr_CA/conversations.properties
+++ b/fr_CA/conversations.properties
@@ -56,17 +56,6 @@ topicChanged=%1$S a changÃ© le sujet en : %2$S.
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S a effacÃ© le sujet.
 
-# LOCALIZATION NOTE (nickSet):
-#   This is

[tor-commits] [tor-browser-bundle/master] Adding gk's new subkey to torbutton.gpg

2015-07-28 Thread gk

commit 3cf76e656decc3e7c327335b426113cd57e01bea
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 23:13:52 2015 +

Adding gk's new subkey to torbutton.gpg
---
 gitian/gpg/torbutton.gpg |  Bin 44645 - 49582 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg
index ebc37d7..b60a95e 100644
Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bump alpha versions and changelog

2015-07-28 Thread gk

commit 494065edd86a3d1b1b159ca4f21210079501b19c
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 22:49:46 2015 +

Bump alpha versions and changelog
---
 Bundle-Data/Docs/ChangeLog.txt |   30 ++
 gitian/versions.alpha  |   16 
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 27d8294..7b3852f 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,33 @@
+Tor Browser 5.0a4 -- August 3 2015
+ * All Platforms
+   * Update Tor to 0.2.7.2
+   * Update OpenSSL to 1.0.1p
+   * Update HTTPS-Everywhere to 5.0.7
+   * Update NoScript to 2.6.9.31
+   * Tor patch backport
+ * Bug 16674: Allow trailing '.' in FQDNs
+   * Update Torbutton to 1.9.3.1
+ * Bug 16268: Show Tor Browser logo on About page
+ * Bug 16639: Check for Updates menu item can cause update failure
+ * Bug 15781: Remove the sessionstore filter
+ * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref
+ * Translation updates
+   * Bug 16884: Prefer IPv6 if available in Tor Browser
+   * Bug 16488: Remove Sign in to Sync from the menu
+   * Bug 13313: Enable bundle fonts
+   * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup)
+   * Bug 15703: Isolate mediasource URIs and media streams to first party
+   * Bug 16429+16416: Isolate blob URIs to first party
+   * Bug 16632: Turn on the background updater
+   * Bug 16528: Prevent indexedDB Modernizr breakage
+   * Bug 16523: Chrome JavaScript debugger is broken
+   * Bug 16236: Windows updater: avoid writing to the registry
+   * Bug 16005: Restrict WebGL minimal mode a bit (fixup)
+   * Bug 16625: Fully disable network prediction
+   * Bug 16495: Tor Browser 5.0a3 crashes with security level set to High
+ * Build System
+   * Bug 15864: rename sha256sums.txt to sha256sums-unsigned-build.txt
+
 Tor Browser 5.0a3 -- June 30 2015
  * All Platforms
* Update Firefox to 38.1.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 6f8b4eb..d4dece0 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,11 +8,11 @@ FIREFOX_VERSION=38.1.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2
-TOR_TAG=tor-0.2.7.1-alpha
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3
+TOR_TAG=tor-0.2.7.2-alpha
 TORLAUNCHER_TAG=0.2.7.6
-TORBUTTON_TAG=1.9.3.0
-HTTPSE_TAG=5.0.5
+TORBUTTON_TAG=1.9.3.1
+HTTPSE_TAG=5.0.7
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
@@ -36,7 +36,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-8
 
-OPENSSL_VER=1.0.1o
+OPENSSL_VER=1.0.1p
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
@@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.27-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.31-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -83,13 +83,13 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz
 NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13
+OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=a59a2150a4fa03091afd670d86333b60b6516ccd104bcef918afe99460fb436a
+NOSCRIPT_HASH=151339f3ba663a527b2bf7ce88a4ea1379833b7ac3b6277cdf67f6ab5a33af1b
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Fixed typo in verify-tags.sh

2015-07-28 Thread gk

commit 5aa2590903abee0cc1dd01690fde3d4e3316cf3a
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 23:19:47 2015 +

Fixed typo in verify-tags.sh
---
 gitian/verify-tags.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index f801b32..b8fc0e0 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -118,7 +118,7 @@ ed25519 $GOED25519_TAG
 siphash $GOSIPHASH_TAG
 goxcrypto   $GO_X_CRYPTO_TAG
 goxnet  $GO_X_NET_TAG
-noto-fonts  $NOTO_FONTS_TAG
+noto-fonts  $NOTOFONTS_TAG
 EOF
 
 # Verify signatures on signed packages

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Changelog fixup

2015-07-28 Thread gk

commit aa51f2712766d2701af3aeedc7ef861f1f209d81
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 23:06:13 2015 +

Changelog fixup
---
 Bundle-Data/Docs/ChangeLog.txt |1 +
 1 file changed, 1 insertion(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 7b3852f..887f4a0 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -15,6 +15,7 @@ Tor Browser 5.0a4 -- August 3 2015
* Bug 16884: Prefer IPv6 if available in Tor Browser
* Bug 16488: Remove Sign in to Sync from the menu
* Bug 13313: Enable bundle fonts
+   * Bug 16662: Enable network.http.spdy.* prefs in meek-http-helper
* Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup)
* Bug 15703: Isolate mediasource URIs and media streams to first party
* Bug 16429+16416: Isolate blob URIs to first party

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Changelog fixes

2015-07-28 Thread gk

commit 24d59c66d99b194015722b12e70cb51dd7a948c9
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 23:31:19 2015 +

Changelog fixes
---
 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 887f4a0..0e38362 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -6,9 +6,10 @@ Tor Browser 5.0a4 -- August 3 2015
* Update NoScript to 2.6.9.31
* Tor patch backport
  * Bug 16674: Allow trailing '.' in FQDNs
+ * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com)
* Update Torbutton to 1.9.3.1
  * Bug 16268: Show Tor Browser logo on About page
- * Bug 16639: Check for Updates menu item can cause update failure
+ * Bug 16639: Check for Updates menu item can cause update download failure
  * Bug 15781: Remove the sessionstore filter
  * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref
  * Translation updates

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Changelog clarifications

2015-07-28 Thread mikeperry

commit d4fd73c796feb6db0091f0f38af32959e46997f6
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 28 16:39:01 2015 -0700

Changelog clarifications
---
 Bundle-Data/Docs/ChangeLog.txt |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 0e38362..8a563cf 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,32 +1,31 @@
 Tor Browser 5.0a4 -- August 3 2015
  * All Platforms
-   * Update Tor to 0.2.7.2
+   * Update Tor to 0.2.7.2-alpha with backported patches:
+ * Bug 16674: Allow trailing '.' in FQDNs
+ * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com)
* Update OpenSSL to 1.0.1p
* Update HTTPS-Everywhere to 5.0.7
* Update NoScript to 2.6.9.31
-   * Tor patch backport
- * Bug 16674: Allow trailing '.' in FQDNs
- * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com)
* Update Torbutton to 1.9.3.1
  * Bug 16268: Show Tor Browser logo on About page
  * Bug 16639: Check for Updates menu item can cause update download failure
  * Bug 15781: Remove the sessionstore filter
  * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref
  * Translation updates
-   * Bug 16884: Prefer IPv6 if available in Tor Browser
-   * Bug 16488: Remove Sign in to Sync from the menu
-   * Bug 13313: Enable bundle fonts
+   * Bug 16884: Prefer IPv6 when supported by the current Tor exit
+   * Bug 16488: Remove Sign in to Sync from the browser menu
+   * Bug 13313: Bundle a fixed set of fonts to defend against fingerprinting
* Bug 16662: Enable network.http.spdy.* prefs in meek-http-helper
* Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup)
* Bug 15703: Isolate mediasource URIs and media streams to first party
* Bug 16429+16416: Isolate blob URIs to first party
-   * Bug 16632: Turn on the background updater
-   * Bug 16528: Prevent indexedDB Modernizr breakage
-   * Bug 16523: Chrome JavaScript debugger is broken
+   * Bug 16632: Turn on the background updater and restart prompting
+   * Bug 16528: Prevent indexedDB Modernizr site breakage on Twitter and 
elsewhere
+   * Bug 16523: Fix in-browser JavaScript debugger
* Bug 16236: Windows updater: avoid writing to the registry
* Bug 16005: Restrict WebGL minimal mode a bit (fixup)
-   * Bug 16625: Fully disable network prediction
-   * Bug 16495: Tor Browser 5.0a3 crashes with security level set to High
+   * Bug 16625: Fully disable network connection prediction
+   * Bug 16495: Fix SVG crash when security level is set to High
  * Build System
* Bug 15864: rename sha256sums.txt to sha256sums-unsigned-build.txt
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'pc/bug16488-01' into tor-browser-38.1.0esr-5.0-1

2015-07-28 Thread gk

commit 522558c8211987bcfd79685e633d47a455407355
Merge: 2a36205 1bde413
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 22:13:26 2015 +

Merge remote-tracking branch 'pc/bug16488-01' into 
tor-browser-38.1.0esr-5.0-1

 browser/app/profile/000-tor-browser.js |1 +
 browser/base/content/browser-fxaccounts.js |   14 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16488: Remove Sign in to Sync from the menu.

2015-07-28 Thread gk

commit 1bde4135dc8dad312e3f8823480545f61af47171
Author: Kathy Brade br...@pearlcrescent.com
Date:   Tue Jul 28 17:11:12 2015 -0400

Bug 16488:  Remove Sign in to Sync from the menu.

By default, hide the Sign in to Sync item (aka the Firefox Sync
status item) within the hamburger menu.
Unhide by setting the pref. services.sync.ui.hidden to false.
---
 browser/app/profile/000-tor-browser.js |1 +
 browser/base/content/browser-fxaccounts.js |   14 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 8188855..d57a3e2 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -60,6 +60,7 @@ pref(browser.syncPromoViewsLeftMap, {\addons\:0, 
\passwords\:0, \bookmar
 pref(services.sync.engine.prefs, false); // Never sync prefs, addons, or 
tabs with other browsers
 pref(services.sync.engine.addons, false);
 pref(services.sync.engine.tabs, false);
+pref(services.sync.ui.hidden, true);
 pref(extensions.getAddons.cache.enabled, false); // 
https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
 pref(browser.newtabpage.directory.ping, data:text/plain,); // Bug 16316 - 
Avoid potential confusion over tiles for now.
 pref(browser.newtabpage.directory.source, data:text/plain,); // Bug 16316 
- Avoid potential confusion over tiles for now.
diff --git a/browser/base/content/browser-fxaccounts.js 
b/browser/base/content/browser-fxaccounts.js
index d6cbccc..760f261 100644
--- a/browser/base/content/browser-fxaccounts.js
+++ b/browser/base/content/browser-fxaccounts.js
@@ -5,6 +5,7 @@
 let gFxAccounts = {
 
   PREF_SYNC_START_DOORHANGER: services.sync.ui.showSyncStartDoorhanger,
+  PREF_SYNC_UI_HIDDEN: services.sync.ui.hidden,
   DOORHANGER_ACTIVATE_DELAY_MS: 5000,
   SYNC_MIGRATION_NOTIFICATION_TITLE: fxa-migration,
 
@@ -80,6 +81,8 @@ let gFxAccounts = {
   Services.obs.addObserver(this, topic, false);
 }
 
+Services.prefs.addObserver(this.PREF_SYNC_UI_HIDDEN, this, false);
+
 addEventListener(activate, this);
 gNavToolbox.addEventListener(customizationstarting, this);
 gNavToolbox.addEventListener(customizationending, this);
@@ -102,6 +105,8 @@ let gFxAccounts = {
   Services.obs.removeObserver(this, topic);
 }
 
+Services.prefs.removeObserver(this.PREF_SYNC_UI_HIDDEN, this);
+
 this._initialized = false;
   },
 
@@ -126,6 +131,9 @@ let gFxAccounts = {
   
this.fxaMigrator.recordTelemetry(this.fxaMigrator.TELEMETRY_DECLINED);
 }
 break;
+  case this.PREF_SYNC_UI_HIDDEN:
+this.updateAppMenuItem();
+break;
   default:
 this.updateUI();
 break;
@@ -203,7 +211,11 @@ let gFxAccounts = {
 }
 
 // Bail out if FxA is disabled.
-if (!this.weave.fxAccountsEnabled) {
+let hideSyncUI = false;
+try {
+  hideSyncUI = Services.prefs.getBoolPref(this.PREF_SYNC_UI_HIDDEN);
+} catch (e) {}
+if (hideSyncUI || !this.weave.fxAccountsEnabled) {
   // When migration transitions from needs-verification to the null state,
   // fxAccountsEnabled is false because migration has not yet finished.  In
   // that case, hide the button.  We'll get another notification with a 
null



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2015-07-28 Thread translation

commit 4245eeb7282c4ad269d1dd29dcff743565596c84
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 11:45:51 2015 +

Update translations for torbutton-torbuttondtd
---
 el/torbutton.dtd |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index 9991686..059780b 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -5,11 +5,11 @@
 !ENTITY torbutton.prefs.use_polipo Î§ÏÎ®ÏÎ· Polipo
 !ENTITY torbutton.prefs.custom_settings Î§ÏÎ®ÏÎ· 
ÏÏÎ¿ÏÎ±ÏÎ¼Î¿ÏÎ¼ÎÎ½ÏÎ½ ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ Î´Î¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®
 !ENTITY torbutton.prefs.proxy.host.http ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï HTTP :
-!ENTITY torbutton.prefs.proxy.host.https ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï SSL :
+!ENTITY torbutton.prefs.proxy.host.https ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï SSL:
 !ENTITY torbutton.prefs.proxy.host.ftp ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï FTP :
-!ENTITY torbutton.prefs.proxy.host.gopher ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï 
Gopher :
-!ENTITY torbutton.prefs.proxy.host.socks ÎÎµÎ½ÏÏÎ¹ÎºÏÏ Ï
ÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®Ï SOCKS :
-!ENTITY torbutton.prefs.proxy.port ÎÏÏÎ± :
+!ENTITY torbutton.prefs.proxy.host.gopher ÎÎ¹Î±Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï 
Gopher:
+!ENTITY torbutton.prefs.proxy.host.socks ÎÎµÎ½ÏÏÎ¹ÎºÏÏ Ï
ÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®Ï SOCKS:
+!ENTITY torbutton.prefs.proxy.port ÎÏÏÎ±:
 !ENTITY torbutton.about.title Î ÎµÏÎ¯ Torbutton
 !ENTITY torbutton.about.version ÎÎºÎ´Î¿ÏÎ·
 !ENTITY torbutton.about.summary Î ÏÎ¿ÏÏÎ±ÏÎµÏÎµÎ¹ ÏÎ·Î½ 
Î¹Î´Î¹ÏÏÎ¹ÎºÎ® Î¶ÏÎ® ÏÎ¿Ï Tor ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÏÎ±Ï.
@@ -155,7 +155,7 @@
 !ENTITY torbutton.prefs.sec_low Î§Î±Î¼Î·Î»Ï (ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿)
 !ENTITY torbutton.prefs.sec_low_usable_desc ÎÏÏÏ ÏÎ±ÏÎÏÎµÎ¹ ÏÎ·Î½ 
ÏÎ¹Î¿ ÎµÏÏÏÎ·ÏÏÎ· ÎµÎ¼ÏÎµÎ¹ÏÎ¯Î±.
 !ENTITY torbutton.prefs.sec_low_desc Î£Îµ Î±ÏÏÏ ÏÎ¿ ÎµÏÎ¯ÏÎµÎ´Î¿ 
Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï, ÏÎ»ÎµÏ Î¿Î¹ Î´ÏÎ½Î±ÏÏÏÎ·ÏÎµÏ ÏÎ¿Ï browser 
ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½ÎµÏ.
-!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip The SVG OpenType font 
rendering mechanism is disabled.
+!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip Î Î¼Î·ÏÎ±Î½Î¹ÏÎ¼ÏÏ 
rendering Î³ÏÎ±Î¼Î¼Î±ÏÎ¿ÏÎµÎ¹ÏÎ¬Ï SVG OpenType ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿Ï.
 !ENTITY torbutton.prefs.sec_med_low ÎÎµÏÎ±Î¯Î¿-ÏÎ±Î¼Î·Î»Ï
 !ENTITY torbutton.prefs.sec_gen_desc Î£Îµ Î±ÏÏÏ ÏÎ¿ ÎµÏÎ¯ÏÎµÎ´Î¿ 
Î±ÏÏÎ±Î»ÎµÎ¯ÎµÏ, Î³Î¯Î½Î¿Î½ÏÎ±Î¹ Î¿Î¹ Î±ÎºÏÎ»Î¿ÏÎ¸ÎµÏ Î±Î»Î»Î±Î³ÎÏ 
(ÏÎ¿ÏÎ¿Î¸ÎµÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ¿Î½ÏÎ¯ÎºÎ¹ Î±ÏÏ ÏÎ¬Î½Ï Î³Î¹Î± 
Î»ÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ):
 !ENTITY torbutton.prefs.sec_html5_desc Î¤Î± HTML5 video ÎºÎ±Î¹ audio media 
ÎÎ³Î¹Î½Î±Î½ click-to-play Î¼ÎÏÏ NoScript. 
@@ -170,16 +170,16 @@
 !ENTITY torbutton.prefs.sec_mathml_desc_tooltip MathML ÎµÎ¹Î½Î±Î¹ 
ÎµÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿.
 !ENTITY torbutton.prefs.sec_med_high ÎÎµÏÎ±Î¯Î¿-ÏÏÎ·Î»Ï
 !ENTITY torbutton.prefs.sec_all_jit_desc ÎÎ»ÎµÏ Î¿Î¹ 
Î²ÎµÎ»ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î®ÏÎµÎ¹Ï ÎµÏÎ¯Î´Î¿ÏÎ·Ï JavaScript ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½ÎµÏ.
-!ENTITY torbutton.prefs.sec_font_rend_desc Some font rendering features are 
disabled.
-!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip The Graphite font 
rendering mechanism is disabled.
+!ENTITY torbutton.prefs.sec_font_rend_desc ÎÎ¬ÏÎ¿Î¹ÎµÏ Î»ÎµÎ¹ÏÎ¿Ï
ÏÎ³Î¯ÎµÏ rendering Î³ÏÎ±Î¼Î¼Î±ÏÎ¿ÏÎµÎ¹ÏÎ¬Ï ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½ÎµÏ.
+!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip Î 
Î¼Î·ÏÎ±Î½Î¹ÏÎ¼ÏÏ rendering ÏÎ·Ï Î³ÏÎ±Î¼Î¼Î±ÏÎ¿ÏÎµÎ¹ÏÎ¬Ï Graphite 
ÎµÎ¯Î½Î±Î¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿Ï.
 !ENTITY torbutton.prefs.sec_svg_desc ÎÎ¬ÏÎ¿Î¹Î¿Î¹ ÏÏÏÎ¿Î¹ 
ÎµÎ¹ÎºÏÎ½ÏÎ½ ÎµÎ¯Î½Î±Î¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿Î¹.
 !ENTITY torbutton.prefs.sec_svg_desc_tooltip ÎÎ¹ ÎµÎ¹ÎºÏÎ½ÎµÏ ÏÏÏÎ¿Ï 
SVG ÎµÎ¯Î½Î±Î¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½ÎµÏ. 
 !ENTITY torbutton.prefs.sec_js_https_desc Î JavaScript ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î· Î±ÏÏ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î® ÏÎµ ÏÎ»ÎµÏ 
ÏÎ¹Ï Î¼Î·-HTTPS Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ. 
-!ENTITY torbutton.prefs.sec_js_desc_tooltip JavaScript can be enabled on a 
per-site basis via the NoScript toolbar button.
+!ENTITY torbutton.prefs.sec_js_desc_tooltip Î JavaScript Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± 
ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯ Î±Î½Î¬ Î´Î¹ÎºÏÏÎ±ÎºÏ ÏÏÏÎ¿ Î¼Îµ ÏÎ¿ ÎºÎ¿Ï
Î¼ÏÎ¯ NoScript ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® ÎµÏÎ³Î±Î»ÎµÎ¹ÏÎ½.
 !ENTITY torbutton.prefs.sec_high Î¥ÏÎ·Î»Ï
 !ENTITY torbutton.prefs.sec_all_js_desc Î JavaScript ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î· Î±ÏÏ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î® ÏÎµ ÏÎ»ÎµÏ 
ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ.
 !ENTITY torbutton.prefs.sec_audio_video_desc ÎÎ¹ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ 
Î¼Î¿ÏÏÎÏ Î®ÏÎ¿Ï ÎºÎ±Î¹ Î²Î¯Î½ÏÎµÎ¿ ÎµÎ¯Î½Î±Î¹ 
Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½ÎµÏ.
-!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip WebM is the only codec 
that remains enabled.
+!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip Î¤Î¿ WebM ÎµÎ¯Î½Î±Î¹ 
Î¼ÏÎ½Î¿Ï ÎºÏÎ´Î¹ÎºÎ¿ÏÎ¿Î¹Î·ÏÎ®Ï ÏÎ¿Ï

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2015-07-28 Thread translation

commit c523896d6296cf11e7f6a5f7ed29a83a65dff12c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 13:15:15 2015 +

Update translations for torcheck_completed
---
 es_CO/torcheck.po |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/es_CO/torcheck.po b/es_CO/torcheck.po
index bab48e6..13207c2 100644
--- a/es_CO/torcheck.po
+++ b/es_CO/torcheck.po
@@ -3,12 +3,14 @@
 # 
 # Translators:
 # KarolinaLo karolil...@hotmail.com, 2015
+# Marcela Garcia-Casteblanco marceg...@hotmail.com, 2015
+# William BeltrÃ¡n wbeltr...@gmail.com, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2015-02-12 14:57+\n
-Last-Translator: KarolinaLo karolil...@hotmail.com\n
+PO-Revision-Date: 2015-07-28 13:10+\n
+Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -26,8 +28,8 @@ msgid 
 the Internet anonymously.
 msgstr Por favor, consulte el sitio Web  a 
href=\https://www.torproject.org/\; de Tor/a para informaciÃ³n futura 
acerca del uso de Tor de manera segura.  Usted es ahora libre de navegar por 
Internet anÃ³nimamente.
 
-msgid There is a security update available for the Tor Browser Bundle.
-msgstr Hay una actualizaciÃ³n de seguridad para el Paquete de NavegaciÃ³n 
Tor.
+msgid There is a security update available for Tor Browser.
+msgstr Hay una actualizacion de seguridad para el navegador Tor
 
 msgid 
 a href=\https://www.torproject.org/download/download-easy.html\;Click 
@@ -93,5 +95,11 @@ msgstr JavaScript estÃ¡ habilitado.
 msgid JavaScript is disabled.
 msgstr JavaScript estÃ¡ deshabilitado.
 
-msgid However, it does not appear to be the Tor Browser Bundle.
-msgstr Sin embargo, no parece ser el Paquete de NavegaciÃ³n de Tor.
+msgid However, it does not appear to be Tor Browser.
+msgstr Sin embargo, no parece ser el navegador Tor.
+
+msgid Run a Relay
+msgstr Ejecutar el envÃo de informaciÃ³n.
+
+msgid Stay Anonymous
+msgstr Permanecer anÃ³nimo

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-commandsproperties] Update translations for tor-messenger-commandsproperties

2015-07-28 Thread translation

commit 7c05b23231ff2e8fc9e890443bd37ce2af678b46
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 14:16:20 2015 +

Update translations for tor-messenger-commandsproperties
---
 ja/commands.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ja/commands.properties b/ja/commands.properties
index 0b285b3..721c97c 100644
--- a/ja/commands.properties
+++ b/ja/commands.properties
@@ -20,8 +20,8 @@ helpHelpString=help lt;namegt;: show the help message for 
the lt;namegt; com
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
 statusCommand=%1$S lt;status messagegt;: set the status to %2$S with an 
optional status message.
-back=available
+back=å©ç¨ã§ãã
 away=away
-busy=unavailable
-dnd=unavailable
-offline=offline
+busy=å©ç¨ã§ããªã
+dnd=å©ç¨ã§ããªã
+offline=ãªãã©ã¤ã³

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1

2015-07-28 Thread mikeperry

commit 8422662a5b8771b6e93a02e4cb6895ff1d8a3126
Merge: 2d81730 0396e4f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 28 07:30:10 2015 -0700

Merge remote-tracking branch 'arthur/15646+2' into 
tor-browser-38.1.0esr-5.0-1

 dom/events/KeyCodeConsensus.h |9 +++--
 dom/events/KeyboardEvent.cpp  |   10 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-07-28 Thread translation

commit ae7a3b4a5335a3c34b624e45378ceb30878008d8
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 14:15:03 2015 +

Update translations for bridgedb
---
 es_CO/LC_MESSAGES/bridgedb.po |   62 -
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index cefa362..2a109f1 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-07-28 13:39+\n
+PO-Revision-Date: 2015-07-28 14:15+\n
 Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
@@ -167,36 +167,36 @@ msgstr Intente adjuntar la mayor cantidad de 
informaciÃ³n que pueda acerca de s
 
 #: lib/bridgedb/strings.py:103
 msgid Here are your bridge lines:
-msgstr AquÃ estan sus lineas de puente:
+msgstr AquÃ estan sus lineas de puente: 
 
 #: lib/bridgedb/strings.py:104
 msgid Get Bridges!
-msgstr 
+msgstr Obtenga Puentes!
 
 #: lib/bridgedb/strings.py:108
 msgid Please select options for bridge type:
-msgstr 
+msgstr Por favor seleccione las opciones para el tipo de puente:
 
 #: lib/bridgedb/strings.py:109
 msgid Do you need IPv6 addresses?
-msgstr 
+msgstr Necesita direcciones IPv6?
 
 #: lib/bridgedb/strings.py:110
 #, python-format
 msgid Do you need a %s?
-msgstr 
+msgstr Necesita un  %s?
 
 #: lib/bridgedb/strings.py:114
 msgid Your browser is not displaying images properly.
-msgstr 
+msgstr Su navegador no muestra las imÃ¡genes correctamente.
 
 #: lib/bridgedb/strings.py:115
 msgid Enter the characters from the image above...
-msgstr 
+msgstr Escriba los caracteres de la imagen de arriba...
 
 #: lib/bridgedb/strings.py:119
 msgid How to start using your bridges
-msgstr 
+msgstr Como empezar a usar sus puentes
 
 #. TRANSLATORS: Please DO NOT translate Tor Browser.
 #: lib/bridgedb/strings.py:121
@@ -205,14 +205,14 @@ msgid 
 To enter bridges into Tor Browser, first go to the %s Tor Browser download\n
 page %s and then follow the instructions there for downloading and starting\n
 Tor Browser.
-msgstr 
+msgstr Para ingresar puentes en su Navegador Tor, primero vaya a la pÃ¡gina 
%s del Navegador de Descarga Tor  %s y siga desde allÃ las instrucciones para 
descargar e iniciar el Navegador Tor.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:126
 msgid 
 When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n
 the wizard until it asks:
-msgstr 
+msgstr Cuando aparezca la opciÃ³n \ConfiguraciÃ³n de Navegador Tor\, haga 
click en \Configurar\ y siga al wizard para ayuda adicional.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:130
@@ -232,57 +232,57 @@ msgstr 
 
 #: lib/bridgedb/strings.py:142
 msgid Displays this message.
-msgstr 
+msgstr Muestra este mensaje.
 
 #. TRANSLATORS: Please try to make it clear that vanilla here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. plain-ol'-vanilla bridges.
 #: lib/bridgedb/strings.py:146
 msgid Request vanilla bridges.
-msgstr 
+msgstr Solicite puentes de vainilla.
 
 #: lib/bridgedb/strings.py:147
 msgid Request IPv6 bridges.
-msgstr 
+msgstr Solicite puentes IPv6.
 
 #. TRANSLATORS: Please DO NOT translate the word the word TYPE.
 #: lib/bridgedb/strings.py:149
 msgid Request a Pluggable Transport by TYPE.
-msgstr 
+msgstr Solicite un Transporte Conectable por TIPO.
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate GnuPG.
 #: lib/bridgedb/strings.py:152
 msgid Get a copy of BridgeDB's public GnuPG key.
-msgstr 
+msgstr Obtenga una copia de la llave pÃºblica GnuPG del BridgeDB.
 
 #: lib/bridgedb/templates/base.html:89
 msgid Report a Bug
-msgstr 
+msgstr Reporte un error (Bug)
 
 #: lib/bridgedb/templates/base.html:92
 msgid Source Code
-msgstr 
+msgstr CÃ³digo de la Fuente
 
 #: lib/bridgedb/templates/base.html:95
 msgid Changelog
-msgstr 
+msgstr Registro de cambios
 
 #: lib/bridgedb/templates/base.html:98
 msgid Contact
-msgstr 
+msgstr Contacto
 
 #: lib/bridgedb/templates/bridges.html:81
 msgid Select All
-msgstr 
+msgstr Seleccionar todo
 
 #: lib/bridgedb/templates/bridges.html:87
 msgid Show QRCode
-msgstr 
+msgstr Mostrar QRCode
 
 #: lib/bridgedb/templates/bridges.html:100
 msgid QRCode for your bridge lines
-msgstr 
+msgstr QRCode para sus lÃneas de puente
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. There was a problem! in your language. For example,
@@ -291,43 +291,43 @@ msgstr 
 #:

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2015-07-28 Thread translation

commit 99542fb72de4748b0083ee7b3d394b693327b6f3
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 14:15:19 2015 +

Update translations for https_everywhere
---
 ja/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index ceb3aac..0a0876f 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -4,7 +4,7 @@
 !ENTITY https-everywhere.about.version ãã¼ã¸ã§ã³
 !ENTITY https-everywhere.about.created_by ä½æè:
 !ENTITY https-everywhere.about.librarians ã«ã¼ã«è¨å®ã©ã¤ãã©ãª
-!ENTITY https-everywhere.about.thanks Thanks to
+!ENTITY https-everywhere.about.thanks ã®ãããã§
 !ENTITY https-everywhere.about.contribute  HTTPS 
Everywhereãå¥½ããªããæ¤è¨ãã¦ãã ãã
 !ENTITY https-everywhere.about.donate_tor Torã«å¯ä»ãã
 !ENTITY https-everywhere.about.tor_lang_code è±èª
@@ -20,7 +20,7 @@
 
 !ENTITY https-everywhere.prefs.title HTTPS Everywhereã®è¨å®
 !ENTITY https-everywhere.prefs.enable_all å¨ã¦æå¹å
-!ENTITY https-everywhere.prefs.disable_all ãã¹ã¦ç¡å¹å
+!ENTITY https-everywhere.prefs.disable_all å¨ã¦ç¡å¹å
 !ENTITY https-everywhere.prefs.reset_defaults 
ããã©ã«ãã«ãªã»ãã
 !ENTITY https-everywhere.prefs.search æ¤ç´¢
 !ENTITY https-everywhere.prefs.site ãµã¤ã

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Enable meek-http-helper prefs that make the ALPN extension match.

2015-07-28 Thread mikeperry

commit 276e390fbd0aa2449675c55a477f337a0f2b78df
Author: David Fifield da...@bamsoftware.com
Date:   Fri Jul 24 10:07:38 2015 +

Enable meek-http-helper prefs that make the ALPN extension match.

https://trac.torproject.org/projects/tor/ticket/15512#comment:3
---
 Bundle-Data/PTConfigs/meek-http-helper-user.js |8 
 1 file changed, 8 insertions(+)

diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js 
b/Bundle-Data/PTConfigs/meek-http-helper-user.js
index 23565d9..de2355c 100644
--- a/Bundle-Data/PTConfigs/meek-http-helper-user.js
+++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js
@@ -9,6 +9,14 @@ user_pref(browser.dom.window.dump.enabled, true);
 // https://trac.torproject.org/projects/tor/ticket/13442#comment:1
 user_pref(security.ssl.disable_session_identifiers, false);
 
+// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN
+// extension.
+// https://trac.torproject.org/projects/tor/ticket/15512
+user_pref(network.http.spdy.enabled, true);
+user_pref(network.http.spdy.enabled.http2, true);
+user_pref(network.http.spdy.enabled.http2draft, true);
+user_pref(network.http.spdy.enabled.v3-1, true);
+
 // Disable safe mode. In case of a crash, we don't want to prompt for a
 // safe-mode browser that has extensions disabled.
 // https://support.mozilla.org/en-US/questions/951221#answer-410562

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2015-07-28 Thread translation

commit 1bb36cbfa888ff0d9d569cdbfee7b7e49855a909
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 14:15:24 2015 +

Update translations for https_everywhere_completed
---
 ja/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index ceb3aac..0a0876f 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -4,7 +4,7 @@
 !ENTITY https-everywhere.about.version ãã¼ã¸ã§ã³
 !ENTITY https-everywhere.about.created_by ä½æè:
 !ENTITY https-everywhere.about.librarians ã«ã¼ã«è¨å®ã©ã¤ãã©ãª
-!ENTITY https-everywhere.about.thanks Thanks to
+!ENTITY https-everywhere.about.thanks ã®ãããã§
 !ENTITY https-everywhere.about.contribute  HTTPS 
Everywhereãå¥½ããªããæ¤è¨ãã¦ãã ãã
 !ENTITY https-everywhere.about.donate_tor Torã«å¯ä»ãã
 !ENTITY https-everywhere.about.tor_lang_code è±èª
@@ -20,7 +20,7 @@
 
 !ENTITY https-everywhere.prefs.title HTTPS Everywhereã®è¨å®
 !ENTITY https-everywhere.prefs.enable_all å¨ã¦æå¹å
-!ENTITY https-everywhere.prefs.disable_all ãã¹ã¦ç¡å¹å
+!ENTITY https-everywhere.prefs.disable_all å¨ã¦ç¡å¹å
 !ENTITY https-everywhere.prefs.reset_defaults 
ããã©ã«ãã«ãªã»ãã
 !ENTITY https-everywhere.prefs.search æ¤ç´¢
 !ENTITY https-everywhere.prefs.site ãµã¤ã

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [guardfraction/master] Always delete expired consensuses from the database.

2015-07-28 Thread asn

commit 31350734b8d457099d4dc8f082a8f0e8fb8732a6
Author: George Kadianakis desnac...@riseup.net
Date:   Tue Jul 28 16:13:52 2015 +0300

Always delete expired consensuses from the database.

Patch by weasel.
---
 guardfraction_cron.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guardfraction_cron.sh b/guardfraction_cron.sh
index 8ca1d78..a869930 100755
--- a/guardfraction_cron.sh
+++ b/guardfraction_cron.sh
@@ -91,7 +91,7 @@ fi
 [ $VERBOSE -gt 0 ]  echo [*] Imported!
 
 # Calculate guardfraction
-if ! python guardfraction.py --db-file=$STATE_DIR/guardfraction.db 
--output=$GUARDFRACTION_OUTPUT_FILE $DAYS_WORTH
+if ! python guardfraction.py --delete-expired 
--db-file=$STATE_DIR/guardfraction.db --output=$GUARDFRACTION_OUTPUT_FILE 
$DAYS_WORTH
 then
 echo 2 Failed during guardfraction calculation.
 exit 1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [guardfraction/master] A few minor improvements to the README.

2015-07-28 Thread asn

commit 7544c665eff618b568ea55d995db30bef02ccc64
Author: George Kadianakis desnac...@riseup.net
Date:   Tue Jul 28 16:13:39 2015 +0300

A few minor improvements to the README.
---
 README |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README b/README
index c91e7c0..a1c161d 100644
--- a/README
+++ b/README
@@ -34,10 +34,10 @@ your filesystem structure.
 As an example, here is a crontab line that will call the script in the
 20th minute of every hour:
 
-20 * * * * sh /home/user/guardiness/guardfraction_cron.sh /dev/null
+20 * * * * /home/user/guardfraction/guardfraction_cron.sh /dev/null
 
 You might also want to use the 'cronic' utility as a better way to
-detect cron script errors. In Debian. you can find it in the moreutils
+detect cron script errors. In Debian, you can find it in the moreutils
 package.
 
 ==Example usage==
@@ -62,12 +62,13 @@ Now you should have a file named 'guardfraction.output' in 
the cwd that
 is meant to be read by little-t-tor.
 
 Unittests can be run by running this in the top dir:
-$ export PYTHON_PATH=`pwd`
+$ export PYTHONPATH=`pwd`
 $ python -m unittest discover test/
 
 ==Dependencies==
 
-stem is needed.
+The python library stem is needed for parsing Tor consensuses. It's
+packaged as 'python-stem' in Debian.
 
 ==Output file format==
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2015-07-28 Thread translation

commit 1ac134d5e0dbbf54b4c65461908f6a6cf5bb9e8c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 13:15:12 2015 +

Update translations for torcheck
---
 es_CO/torcheck.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/es_CO/torcheck.po b/es_CO/torcheck.po
index 7028270..13207c2 100644
--- a/es_CO/torcheck.po
+++ b/es_CO/torcheck.po
@@ -3,13 +3,14 @@
 # 
 # Translators:
 # KarolinaLo karolil...@hotmail.com, 2015
+# Marcela Garcia-Casteblanco marceg...@hotmail.com, 2015
 # William BeltrÃ¡n wbeltr...@gmail.com, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2015-06-19 17:39+\n
-Last-Translator: William BeltrÃ¡n wbeltr...@gmail.com\n
+PO-Revision-Date: 2015-07-28 13:10+\n
+Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -95,10 +96,10 @@ msgid JavaScript is disabled.
 msgstr JavaScript estÃ¡ deshabilitado.
 
 msgid However, it does not appear to be Tor Browser.
-msgstr 
+msgstr Sin embargo, no parece ser el navegador Tor.
 
 msgid Run a Relay
-msgstr 
+msgstr Ejecutar el envÃo de informaciÃ³n.
 
 msgid Stay Anonymous
-msgstr 
+msgstr Permanecer anÃ³nimo

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-07-28 Thread translation

commit b25736a79dcdf9021f56d0481a8a8c193be2b19e
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 13:15:03 2015 +

Update translations for bridgedb
---
 es_CO/LC_MESSAGES/bridgedb.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 87e90bd..722637d 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Andres Felipe Torres felipetorr...@hotmail.com, 2015
+# Marcela Garcia-Casteblanco marceg...@hotmail.com, 2015
 # William BeltrÃ¡n wbeltr...@gmail.com, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-07-18 19:15+\n
-Last-Translator: Andres Felipe Torres felipetorr...@hotmail.com\n
+PO-Revision-Date: 2015-07-28 13:13+\n
+Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -62,16 +63,16 @@ msgstr Bienvenido a BrigdeDB! 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
 #: lib/bridgedb/strings.py:30
 msgid Currently supported transport TYPEs:
-msgstr 
+msgstr Actualmente transporte apoyado TYPE:
 
 #: lib/bridgedb/strings.py:31
 #, python-format
 msgid Hey, %s!
-msgstr 
+msgstr Eh, %s!
 
 #: lib/bridgedb/strings.py:32
 msgid Hello, friend!
-msgstr 
+msgstr Hola, amigo!
 
 #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
 msgid Public Keys

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-07-28 Thread translation

commit a9a3493edffb2a130617f5d64f41044d8159c3f5
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 13:45:03 2015 +

Update translations for bridgedb
---
 es_CO/LC_MESSAGES/bridgedb.po |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 722637d..cefa362 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-07-28 13:13+\n
+PO-Revision-Date: 2015-07-28 13:39+\n
 Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
@@ -126,16 +126,16 @@ msgstr 
 
 #: lib/bridgedb/strings.py:76
 msgid What are bridges?
-msgstr 
+msgstr Que son los puentes?
 
 #: lib/bridgedb/strings.py:77
 #, python-format
 msgid %s Bridges %s are Tor relays that help you circumvent censorship.
-msgstr 
+msgstr %s Puentes %s son para el envÃo de informaciÃ³n Tor que le ayuda a 
eludir la censura.
 
 #: lib/bridgedb/strings.py:82
 msgid I need an alternative way of getting bridges!
-msgstr 
+msgstr Necesito una vÃa alternativa para obtener puentes!
 
 #: lib/bridgedb/strings.py:83
 #, python-format
@@ -143,17 +143,17 @@ msgid 
 Another way to get bridges is to send an email to %s. Please note that you 
must\n
 send the email using an address from one of the following email providers:\n
 %s, %s or %s.
-msgstr 
+msgstr Otra manera de obtener puentes es enviar un correo electrÃ³nico a %s. 
Tenga en cuenta que debe enviar el correo electrÃ³nico utilizando una de las 
direcciones de la siguiente lista de proveedores:  \n%s, %s o %s.
 
 #: lib/bridgedb/strings.py:90
 msgid My bridges don't work! I need help!
-msgstr 
+msgstr Mis puentes no funcionan! Necesito ayuda!
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:92
 #, python-format
 msgid If your Tor doesn't work, you should email %s.
-msgstr 
+msgstr Si su Tor no funciona, usted debe contactar por correo electrÃ³nico a 
%s.
 
 #. TRANSLATORS: Please DO NOT translate Pluggable Transports.
 #. TRANSLATORS: Please DO NOT translate Tor Browser.
@@ -163,11 +163,11 @@ msgid 
 Try including as much info about your case as you can, including the list 
of\n
 bridges and Pluggable Transports you tried to use, your Tor Browser 
version,\n
 and any messages which Tor gave out, etc.
-msgstr 
+msgstr Intente adjuntar la mayor cantidad de informaciÃ³n que pueda acerca de 
su caso, incluyendo la lista de puentes y Transportes Conectables que usted 
intentÃ³ utilizar, su versiÃ³n de NavegadorTor, y cualquier mensaje que Tor 
haya mostrado, etc.
 
 #: lib/bridgedb/strings.py:103
 msgid Here are your bridge lines:
-msgstr 
+msgstr AquÃ estan sus lineas de puente:
 
 #: lib/bridgedb/strings.py:104
 msgid Get Bridges!

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent

2015-07-28 Thread mikeperry

commit 0396e4f834a31ec0cc7b9c4b853417891a09c43c
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Mon Jul 27 17:17:15 2015 -0700

fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
---
 dom/events/KeyCodeConsensus.h |9 +++--
 dom/events/KeyboardEvent.cpp  |   10 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h
index 5493c36..53ec7f6 100644
--- a/dom/events/KeyCodeConsensus.h
+++ b/dom/events/KeyCodeConsensus.h
@@ -5,14 +5,15 @@
 
 #include nsString.h
 #include nsDataHashtable.h
+#include mozilla/StaticMutex.h
 
 // KEY_INTERNAL is called by KEY or SHIFT.
-#define KEY_INTERNAL(key, code, keyCode, shift)\
+#define KEY_INTERNAL(key, code, keyCode, shift) \
 gCodes-Put(NS_LITERAL_STRING(key), NS_LITERAL_STRING(#code));  \
 gKeyCodes-Put(NS_LITERAL_STRING(key), keyCode);\
 gShiftStates-Put(NS_LITERAL_STRING(key), shift);
 
-// KEY and SHIFT Assign a consensus codeName and keyCode for the given keyName.
+// KEY and SHIFT assign a consensus codeName and keyCode for the given keyName.
 // KEY indicates that shift is off.
 #define KEY(key, code, keyCode) KEY_INTERNAL(key, code, keyCode, false)
 // SHIFT indicates that shift is on.
@@ -26,12 +27,16 @@ static nsDataHashtablensStringHashKey, uint32_t* 
gKeyCodes;
 // gShiftStates provides a shift value for each keyName.
 static nsDataHashtablensStringHashKey, bool* gShiftStates;
 
+static StaticMutex createKeyCodesMutex;
+
 // Populate the global static maps gCodes, gKeCodes, gShiftStates
 // with their constant values.
 static void createKeyCodes()
 {
   if (gCodes) return;
 
+  StaticMutexAutoLock lock(createKeyCodesMutex);
+
   gCodes = new nsDataHashtablensStringHashKey, nsString();
   gKeyCodes = new nsDataHashtablensStringHashKey, uint32_t();
   gShiftStates = new nsDataHashtablensStringHashKey, bool();
diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp
index 8829b8f..76e6e39 100644
--- a/dom/events/KeyboardEvent.cpp
+++ b/dom/events/KeyboardEvent.cpp
@@ -46,7 +46,15 @@ NS_INTERFACE_MAP_END_INHERITING(UIEvent)
 bool
 KeyboardEvent::AltKey()
 {
-  return mEvent-AsKeyboardEvent()-IsAlt();
+  bool altState = mEvent-AsKeyboardEvent()-IsAlt();
+  if (ResistFingerprinting()) {
+nsString keyName;
+GetKey(keyName);
+bool exists = gCodes-Get(keyName, nullptr);
+return exists ? false : altState;
+  } else {
+return altState;
+  }
 }
 
 NS_IMETHODIMP



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-07-28 Thread translation

commit ab74131c97bfc2859cec0cdcb9b8b2fff6cdc91c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 14:45:03 2015 +

Update translations for bridgedb
---
 es_CO/LC_MESSAGES/bridgedb.po |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 2a109f1..7f1ecc4 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-07-28 14:15+\n
+PO-Revision-Date: 2015-07-28 14:25+\n
 Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
@@ -48,7 +48,7 @@ msgstr AquÃ estÃ¡n tus puentes. 
 msgid 
 You have exceeded the rate limit. Please slow down! The minimum time 
between\n
 emails is %s hours. All further emails during this time period will be 
ignored.
-msgstr 
+msgstr Usted a excedido el lÃmite de velocidad. Vaya mÃ¡s despacio por 
favor! El tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Todos los 
correos electrÃ³nicos adicionales serÃ¡n ignorados durante este perÃodo.
 
 #: lib/bridgedb/strings.py:25
 msgid 
@@ -219,7 +219,7 @@ msgstr Cuando aparezca la opciÃ³n \ConfiguraciÃ³n de 
Navegador Tor\, haga cli
 msgid 
 Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n
 to the Tor network?
-msgstr 
+msgstr Su Proveedor de Servicio de Internet (ISP) bloquea o controla de 
alguna manera las conexiones a la redTor?
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:134
@@ -332,17 +332,17 @@ msgstr Paso %s 2 %s
 #: lib/bridgedb/templates/index.html:27
 #, python-format
 msgid Get %s bridges %s
-msgstr 
+msgstr Obtenga %s puentes %s
 
 #: lib/bridgedb/templates/index.html:36
 #, python-format
 msgid Step %s3%s
-msgstr 
+msgstr Paso %s 3 %s
 
 #: lib/bridgedb/templates/index.html:38
 #, python-format
 msgid Now %s add the bridges to Tor Browser %s
-msgstr 
+msgstr Ahora %s agregue los puentes para Navegador Tor %s
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -351,7 +351,7 @@ msgstr 
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid %sJ%sust give me bridges!
-msgstr 
+msgstr %s J %s solamente deme los puentes!
 
 #: lib/bridgedb/templates/options.html:52
 msgid Advanced Options

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-07-28 Thread translation

commit bcc5087b31ed1e25b06084182454b58afdf11f10
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:15:03 2015 +

Update translations for bridgedb
---
 es_CO/LC_MESSAGES/bridgedb.po |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 7f1ecc4..1a25f6e 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-07-28 14:25+\n
+PO-Revision-Date: 2015-07-28 15:10+\n
 Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
@@ -86,7 +86,7 @@ msgstr Llaves publicas 
 msgid 
 This email was generated with rainbows, unicorns, and sparkles\n
 for %s on %s at %s.
-msgstr 
+msgstr Este correo electrÃ³nico ha sido creado con arco iris, unicornios y 
destellos para %s en %s a %s.
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate Pluggable Transports.
@@ -100,7 +100,7 @@ msgid 
 difficult for anyone watching your internet traffic to determine that you 
are\n
 using Tor.\n
 \n
-msgstr 
+msgstr BrideDB puede proporcionar puentes con varios %s tipos de Transportes 
Conectables %s, \nlo cual puede complicar sus conecciones a la red Tor, creando 
mas\ndificultades para alguien observando su trÃ¡fico de internet para 
determinar que usted estÃ¡ utilizando Tor. \n
 
 #. TRANSLATORS: Please DO NOT translate Pluggable Transports.
 #: lib/bridgedb/strings.py:54
@@ -108,7 +108,7 @@ msgid 
 Some bridges with IPv6 addresses are also available, though some Pluggable\n
 Transports aren't IPv6 compatible.\n
 \n
-msgstr 
+msgstr Algunos puentes con direcciones IPv6 tambiÃ©n se encuentran 
disponibles, aunque algunos Transportes Conectables no son compatibles con 
IPv6. \n
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: The phrase plain-ol'-vanilla means plain, boring,
@@ -122,7 +122,7 @@ msgid 
 Pluggable Transports %s which maybe doesn't sound as cool, but they can 
still\n
 help to circumvent internet censorship in many cases.\n
 \n
-msgstr 
+msgstr Adicionalmente, BridgeDB posee suficientes puentes plain-ol'-vanilla 
%s sin ningÃºn \nTransporte Conectable %s lo cual puede no sonar tan 
interesante, pero aÃºn\n pueden en muchas ocasiones ayudar a eludir la censura 
en Internet.  \n\n
 
 #: lib/bridgedb/strings.py:76
 msgid What are bridges?
@@ -228,7 +228,7 @@ msgid 
 paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n
 you should be good to go! If you experience trouble, try clicking the 
'Help'\n
 button in the 'Tor Network Settings' wizard for further assistance.
-msgstr 
+msgstr Seleccione 'Si' y luego haga click en 'Siguiente'. Para configurar sus 
puentes nuevos, copie y pegue las lÃneas de puente en la casilla de ingreso de 
texto. Por Ãºltimo, haga click en 'Conectar' y listo! Si tiene algÃºn 
inconveniente, haga click en la opciÃ³n 'Ayuda' en el wizard de 'ConfiguraciÃ³n 
de Red Tor' para asistencia adicional.
 
 #: lib/bridgedb/strings.py:142
 msgid Displays this message.
@@ -355,7 +355,7 @@ msgstr %s J %s solamente deme los puentes!
 
 #: lib/bridgedb/templates/options.html:52
 msgid Advanced Options
-msgstr 
+msgstr Opciones avanzadas
 
 #: lib/bridgedb/templates/options.html:88
 msgid No
@@ -371,7 +371,7 @@ msgstr Ninguno
 #: lib/bridgedb/templates/options.html:127
 #, python-format
 msgid %sY%ses!
-msgstr 
+msgstr %sY%ses!
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -379,4 +379,4 @@ msgstr 
 #: lib/bridgedb/templates/options.html:151
 #, python-format
 msgid %sG%set Bridges
-msgstr 
+msgstr %sG%set Puentes

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed

2015-07-28 Thread translation

commit 3e62df2b698d0a1ae0ebdc73232de127e6c56bf0
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:46:19 2015 +

Update translations for tor-messenger-conversationsproperties_completed
---
 fr_CA/conversations.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/conversations.properties b/fr_CA/conversations.properties
index c324159..a00a2d8 100644
--- a/fr_CA/conversations.properties
+++ b/fr_CA/conversations.properties
@@ -41,7 +41,7 @@ autoReply=RÃ©ponse automatique - %S
 
 # LOCALIZATION NOTE (noTopic):
 # Displayed instead of the topic when no topic is set.
-noTopic=Aucun message de sujet pour ce clavardoir
+noTopic=Aucun message de sujet pour ce clavardoir.
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2015-07-28 Thread translation

commit 9fbd0a39ec6658ce7a6eae20b98e619f71f49421
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:46:31 2015 +

Update translations for tor-messenger-ircproperties_completed
---
 fr_CA/irc.properties |4 
 1 file changed, 4 insertions(+)

diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties
index 74db24e..53d57bf 100644
--- a/fr_CA/irc.properties
+++ b/fr_CA/irc.properties
@@ -96,6 +96,10 @@ message.usermode=Le mode %1$S a Ã©tÃ© dÃ©fini par %3$S pour 
%2$S .
 message.channelmode=Le mode de canal %1$S a Ã©tÃ© dÃ©fini par %2$S.
 #%S is the user's mode.
 message.yourmode=Votre mode est %S.
+#%1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S est maintenant connu en tant que %2$S.
+#%S is your new nick.
+message.nick.you=Vous Ãªtes maintenant connu en tant que %S.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=Impossible d'utiliser le pseudonyme souhaitÃ©. Votre pseudo 
reste %S.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2015-07-28 Thread translation

commit 7bd5a7702c124eb621ae84a090740250386e2363
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:46:28 2015 +

Update translations for tor-messenger-ircproperties
---
 fr_CA/irc.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties
index 27b6051..53d57bf 100644
--- a/fr_CA/irc.properties
+++ b/fr_CA/irc.properties
@@ -97,9 +97,9 @@ message.channelmode=Le mode de canal %1$S a Ã©tÃ© dÃ©fini par 
%2$S.
 #%S is the user's mode.
 message.yourmode=Votre mode est %S.
 #%1$S is the old nick and %2$S is the new nick.
-message.nick=%1$S is now known as %2$S.
+message.nick=%1$S est maintenant connu en tant que %2$S.
 #%S is your new nick.
-message.nick.you=You are now known as %S.
+message.nick.you=Vous Ãªtes maintenant connu en tant que %S.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=Impossible d'utiliser le pseudonyme souhaitÃ©. Votre pseudo 
reste %S.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2015-07-28 Thread translation

commit 24d4f818a4744ac597a96fe1670185b025c36649
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:46:16 2015 +

Update translations for tor-messenger-conversationsproperties
---
 fr_CA/conversations.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/conversations.properties b/fr_CA/conversations.properties
index c324159..a00a2d8 100644
--- a/fr_CA/conversations.properties
+++ b/fr_CA/conversations.properties
@@ -41,7 +41,7 @@ autoReply=RÃ©ponse automatique - %S
 
 # LOCALIZATION NOTE (noTopic):
 # Displayed instead of the topic when no topic is set.
-noTopic=Aucun message de sujet pour ce clavardoir
+noTopic=Aucun message de sujet pour ce clavardoir.
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Adding new subkeys to gk's key

2015-07-28 Thread gk

commit 83e881b69a286c9d1e1c33f7522bb1ad9681b6f2
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 15:59:40 2015 +

Adding new subkeys to gk's key
---
 gitian/gpg/gk.gpg |  Bin 11926 - 33866 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg
index 9923c96..ad731ca 100644
Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2015-07-28 Thread translation

commit 3a55f4c590b02d406f5b83610c052a44a107f3e5
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 15:15:07 2015 +

Update translations for bridgedb_completed
---
 es_CO/LC_MESSAGES/bridgedb.po |  382 +
 1 file changed, 382 insertions(+)

diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
new file mode 100644
index 000..1a25f6e
--- /dev/null
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,382 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2015 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+# 
+# Translators:
+# Andres Felipe Torres felipetorr...@hotmail.com, 2015
+# Marcela Garcia-Casteblanco marceg...@hotmail.com, 2015
+# William BeltrÃ¡n wbeltr...@gmail.com, 2015
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
+PO-Revision-Date: 2015-07-28 15:10+\n
+Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
+Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Generated-By: Babel 0.9.6\n
+Language: es_CO\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. BridgeDB
+#. pluggable transport
+#. pluggable transports
+#. obfs2
+#. obfs3
+#. scramblesuit
+#. fteproxy
+#. Tor
+#. Tor Browser
+#: lib/bridgedb/HTTPServer.py:107
+msgid Sorry! Something went wrong with your request.
+msgstr Perdon! Algo fallo con tu solicitud
+
+#: lib/bridgedb/strings.py:18
+msgid [This is an automated message; please do not reply.]
+msgstr [Este es un mensaje automatizado, por favor no responda.]
+
+#: lib/bridgedb/strings.py:20
+msgid Here are your bridges:
+msgstr AquÃ estÃ¡n tus puentes. 
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid 
+You have exceeded the rate limit. Please slow down! The minimum time 
between\n
+emails is %s hours. All further emails during this time period will be 
ignored.
+msgstr Usted a excedido el lÃmite de velocidad. Vaya mÃ¡s despacio por 
favor! El tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Todos los 
correos electrÃ³nicos adicionales serÃ¡n ignorados durante este perÃodo.
+
+#: lib/bridgedb/strings.py:25
+msgid 
+COMMANDs: (combine COMMANDs to specify multiple options simultaneously)
+msgstr COMANDOs (combina COMANDOs para especificar opciones mÃºltiples 
simultÃ¡neamente) 
+
+#. TRANSLATORS: Please DO NOT translate the word BridgeDB.
+#: lib/bridgedb/strings.py:28
+msgid Welcome to BridgeDB!
+msgstr Bienvenido a BrigdeDB! 
+
+#. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
+#: lib/bridgedb/strings.py:30
+msgid Currently supported transport TYPEs:
+msgstr Actualmente transporte apoyado TYPE:
+
+#: lib/bridgedb/strings.py:31
+#, python-format
+msgid Hey, %s!
+msgstr Eh, %s!
+
+#: lib/bridgedb/strings.py:32
+msgid Hello, friend!
+msgstr Hola, amigo!
+
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+msgid Public Keys
+msgstr Llaves publicas 
+
+#. TRANSLATORS: This string will end up saying something like:
+#. This email was generated with rainbows, unicorns, and sparkles
+#. for al...@example.com on Friday, 09 May, 2014 at 18:59:39.
+#: lib/bridgedb/strings.py:37
+#, python-format
+msgid 
+This email was generated with rainbows, unicorns, and sparkles\n
+for %s on %s at %s.
+msgstr Este correo electrÃ³nico ha sido creado con arco iris, unicornios y 
destellos para %s en %s a %s.
+
+#. TRANSLATORS: Please DO NOT translate BridgeDB.
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#. TRANSLATORS: Please DO NOT translate Tor.
+#. TRANSLATORS: Please DO NOT translate Tor Network.
+#: lib/bridgedb/strings.py:47
+#, python-format
+msgid 
+BridgeDB can provide bridges with several %stypes of Pluggable 
Transports%s,\n
+which can help obfuscate your connections to the Tor Network, making it 
more\n
+difficult for anyone watching your internet traffic to determine that you 
are\n
+using Tor.\n
+\n
+msgstr BrideDB puede proporcionar puentes con varios %s tipos de Transportes 
Conectables %s, \nlo cual puede complicar sus conecciones a la red Tor, creando 
mas\ndificultades para alguien observando su trÃ¡fico de internet para 
determinar que usted estÃ¡ utilizando Tor. \n
+
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#: lib/bridgedb/strings.py:54
+msgid 
+Some bridges with IPv6 addresses are also available, though some Pluggable\n
+Transports aren't IPv6 compatible.\n
+\n
+msgstr Algunos puentes con direcciones IPv6 tambiÃ©n se encuentran

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2015-07-28 Thread translation

commit e5b8f69fe48d2da354f6aa9105c23bfd923b3a93
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 10:46:24 2015 +

Update translations for tor-messenger-ircproperties
---
 es/irc.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/irc.properties b/es/irc.properties
index d0146bc..02c10a2 100644
--- a/es/irc.properties
+++ b/es/irc.properties
@@ -97,9 +97,9 @@ message.channelmode=Modo de canal %1$S establecido por %2$S.
 #%S is the user's mode.
 message.yourmode=Su modo es %S.
 #%1$S is the old nick and %2$S is the new nick.
-message.nick=%1$S is now known as %2$S.
+message.nick=%1$S ahora es conocido como %2$S.
 #%S is your new nick.
-message.nick.you=You are now known as %S.
+message.nick.you=Usted ahora es conocido como %S.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=No se pudo usar el apodo (nick) deseado. Su apodo continÃºa 
siendo %S.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2015-07-28 Thread translation

commit b5f69608b2739b67cfe14de27ab50c96540b1472
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 10:46:28 2015 +

Update translations for tor-messenger-ircproperties_completed
---
 es/irc.properties |4 
 1 file changed, 4 insertions(+)

diff --git a/es/irc.properties b/es/irc.properties
index 770a441..02c10a2 100644
--- a/es/irc.properties
+++ b/es/irc.properties
@@ -96,6 +96,10 @@ message.usermode=Modo %1$S para %2$S establecido por %3$S.
 message.channelmode=Modo de canal %1$S establecido por %2$S.
 #%S is the user's mode.
 message.yourmode=Su modo es %S.
+#%1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S ahora es conocido como %2$S.
+#%S is your new nick.
+message.nick.you=Usted ahora es conocido como %S.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=No se pudo usar el apodo (nick) deseado. Su apodo continÃºa 
siendo %S.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'arthur/13313+4'

2015-07-28 Thread gk

commit 08b05d52c58c03e1a0c712dc64845185e53abe37
Merge: 83e881b bdc340e
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 17:09:10 2015 +

Merge remote-tracking branch 'arthur/13313+4'

 Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt   |   92 +++
 Bundle-Data/Docs/Licenses/Noto-Fonts.txt  |  201 +
 gitian/descriptors/linux/gitian-bundle.yml|   15 ++
 gitian/descriptors/linux/gitian-firefox.yml   |2 +-
 gitian/descriptors/mac/gitian-bundle.yml  |   15 ++
 gitian/descriptors/mac/gitian-firefox.yml |2 +-
 gitian/descriptors/windows/gitian-bundle.yml  |   15 ++
 gitian/descriptors/windows/gitian-firefox.yml |2 +-
 gitian/fetch-inputs.sh|5 +-
 gitian/mkbundle-linux.sh  |2 +-
 gitian/mkbundle-mac.sh|2 +-
 gitian/mkbundle-windows.sh|2 +-
 gitian/verify-tags.sh |3 +-
 gitian/versions   |5 +
 gitian/versions.alpha |5 +
 gitian/versions.beta  |5 +
 gitian/versions.nightly   |5 +
 17 files changed, 369 insertions(+), 9 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Add --enable-bundled-fonts to firefox config.

2015-07-28 Thread gk

commit b2f9648ada10c5f9eb0dd093928bfd4919d76f51
Author: David Fifield da...@bamsoftware.com
Date:   Wed Dec 31 20:21:51 2014 +

Add --enable-bundled-fonts to firefox config.
---
 gitian/descriptors/linux/gitian-firefox.yml   |2 +-
 gitian/descriptors/mac/gitian-firefox.yml |2 +-
 gitian/descriptors/windows/gitian-firefox.yml |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml 
b/gitian/descriptors/linux/gitian-firefox.yml
index 05b2beb..1efed90 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -110,7 +110,7 @@ script: |
   # that feature it would hang sometimes for unknown but to libfaketime related
   # reasons.
   export LD_PRELOAD=
-  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}
+  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts
   # We need libfaketime for all the timestamps e.g. written into the libraries.
   # BUT we need to exclude |make build| from it. Otherwise the build fails 
close
   # to the end, see #12461 comment 8 and later. Additionally, we need to avoid
diff --git a/gitian/descriptors/mac/gitian-firefox.yml 
b/gitian/descriptors/mac/gitian-firefox.yml
index e8f1046..8b85b5a 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -69,7 +69,7 @@ script: |
   # that feature it would hang sometimes for unknown but to libfaketime related
   # reasons.
   export LD_PRELOAD=
-  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}
+  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts
   find -type f -print0 | xargs -0 touch --date=$REFERENCE_DATETIME
   # We need libfaketime for all the timestamps e.g. written into the libraries.
   # BUT we need to exclude |make build| from it. Otherwise the build fails 
close
diff --git a/gitian/descriptors/windows/gitian-firefox.yml 
b/gitian/descriptors/windows/gitian-firefox.yml
index c7efb62..7358922 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -86,7 +86,7 @@ script: |
   # that feature it would hang sometimes for unknown but to libfaketime related
   # reasons.
   export LD_PRELOAD=
-  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}
+  make -f client.mk configure 
CONFIGURE_ARGS=--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts
   find -type f -print0 | xargs -0 touch --date=$REFERENCE_DATETIME
   #
   mkdir -p ~/build/bin/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Download and verify Noto fonts and Noto CJK font

2015-07-28 Thread gk

commit d72f6dc3bdfdcc719cb5e49d943756d289178f0a
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Mon Jul 20 05:22:35 2015 +

Download and verify Noto fonts and Noto CJK font
---
 gitian/fetch-inputs.sh  |5 +++--
 gitian/verify-tags.sh   |3 ++-
 gitian/versions |5 +
 gitian/versions.alpha   |5 +
 gitian/versions.beta|5 +
 gitian/versions.nightly |5 +
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 2a5bd16..a97ff62 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -155,7 +155,7 @@ do
   get ${!PACKAGE} ${MIRROR_URL_ASN}${!PACKAGE}
 done
 
-for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO
+for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT
 do
   URL=${i}_URL
   PACKAGE=${i}_PACKAGE
@@ -167,7 +167,7 @@ wget -U  -N ${NOSCRIPT_URL}
 
 # Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all)
-for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC
+for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC NOTOCJKFONT
 do
PACKAGE=${i}_PACKAGE
HASH=${i}_HASH
@@ -258,6 +258,7 @@ siphash   https://github.com/dchest/siphash.git 
$GOSIPHASH_TAG
 goxcrypto https://go.googlesource.com/crypto  $GO_X_CRYPTO_TAG
 goxnethttps://go.googlesource.com/net  $GO_X_NET_TAG
 obfs4 
https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG
+noto-fontshttps://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG
 EOF
 
 exit 0
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 2c4e8c6..f801b32 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -118,6 +118,7 @@ ed25519 $GOED25519_TAG
 siphash $GOSIPHASH_TAG
 goxcrypto   $GO_X_CRYPTO_TAG
 goxnet  $GO_X_NET_TAG
+noto-fonts  $NOTO_FONTS_TAG
 EOF
 
 # Verify signatures on signed packages
@@ -141,7 +142,7 @@ done
 
 # Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all)
-for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC
+for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC NOTOCJKFONT
 do
PACKAGE=${i}_PACKAGE
HASH=${i}_HASH
diff --git a/gitian/versions b/gitian/versions
index 02e6217..cea6029 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -32,6 +32,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
 GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
 OBFS4_TAG=obfs4proxy-0.0.5
+NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-8
 
@@ -53,6 +54,7 @@ SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
 PARSLEY_VER=1.2
 GO_VER=1.4.2
+NOTOCJKFONT_VER=1.004
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -78,6 +80,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz
 LXML_PACKAGE=lxml-${LXML_VER}.tar.gz
 PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
+NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf
 
 # Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13
@@ -99,6 +102,7 @@ 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
+NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd
 
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
@@ -123,3 +127,4 @@ 
SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS
 LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}
 
PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE}
 GO_URL=https://golang.org/dl/${GO_PACKAGE}
+NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index cee61cd..6f8b4eb 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -32,6 +32,7 @@

[tor-commits] [tor-browser-bundle/master] Install Noto fonts into bundles.

2015-07-28 Thread gk

commit bdc340e960975098eb395fcf92c906748294c8fa
Author: David Fifield da...@bamsoftware.com
Date:   Mon Sep 29 04:35:26 2014 +

Install Noto fonts into bundles.

They are in the fonts directory next to the firefox executable, the
directory that is activated by --enable-bundled-fonts in
https://bugzilla.mozilla.org/show_bug.cgi?id=998844.

The license for the Noto fonts is from

https://github.com/googlei18n/noto-fonts/blob/720e34851382ee3c1ef024d8dffb68ffbfb234c2/LICENSE

The license for Noto CJK is from

https://github.com/googlei18n/noto-cjk/blob/f36eda03dfa5582a6d49abbfb5c83d0209584158/LICENSE
---
 Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt  |   92 
 Bundle-Data/Docs/Licenses/Noto-Fonts.txt |  201 ++
 gitian/descriptors/linux/gitian-bundle.yml   |   15 ++
 gitian/descriptors/mac/gitian-bundle.yml |   15 ++
 gitian/descriptors/windows/gitian-bundle.yml |   15 ++
 gitian/mkbundle-linux.sh |2 +-
 gitian/mkbundle-mac.sh   |2 +-
 gitian/mkbundle-windows.sh   |2 +-
 8 files changed, 341 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt 
b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt
new file mode 100644
index 000..d952d62
--- /dev/null
+++ b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+---
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+Font Software refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+Reserved Font Name refers to any names specified as such after the
+copyright statement(s).
+
+Original Version refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+Modified Version refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+Author refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION  CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to

[tor-commits] [torbutton/master] Bug 16268: Taking lower-case into account

2015-07-28 Thread gk

commit 03cf87e2a76d15016703de631ca5140e42fdb1f4
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 17:01:55 2015 +

Bug 16268: Taking lower-case into account

Patch by Pearl Crescent
---
 trans_tools/import-translations.sh |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/trans_tools/import-translations.sh 
b/trans_tools/import-translations.sh
index 28816ff..ae686b4 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -66,18 +66,24 @@ fi
 echo Locales: $BUNDLE_LOCALES
 cd translation
 for KEYVAL in ${FILEMAP[@]}; do
-  FILE=${KEYVAL%%:*}
+  DEST_FILE=${KEYVAL%%:*}
   BRANCH=${KEYVAL##*:}
-  echo Updating ${FILE}...
+  echo Updating ${DEST_FILE}...
   git checkout -q $BRANCH
   git merge -q origin/$BRANCH
   for i in $BUNDLE_LOCALES;
   do
 UL=`echo $i|tr - _`
 mkdir -p ../$LOCALE_DIR/$i/
+# Some file names are lowercase in Transifex.
+if [ -f $UL/$DEST_FILE ]; then
+  SRCFILE=$DEST_FILE
+else
+  SRCFILE=`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`
+fi
 # Use sed to work around a Transifex double entity issue.
 sed -e 's/\amp;brandShortName;/\brandShortName;/g'   
\
 -e 's/\amp;vendorShortName;/\vendorShortName;/g' 
\
-$UL/$FILE  ../$LOCALE_DIR/$i/$FILE
+$UL/$SRCFILE  ../$LOCALE_DIR/$i/$DEST_FILE
   done
 done

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts

2015-07-28 Thread gk

commit 2a36205b70076fc26145400addaa383142d71c81
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 23 09:44:20 2015 -0700

Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts
---
 gfx/thebes/gfxDWriteFontList.cpp |4 
 gfx/thebes/gfxFT2FontList.cpp|   28 +++-
 gfx/thebes/gfxFontUtils.cpp  |   25 +
 gfx/thebes/gfxFontUtils.h|   11 +++
 gfx/thebes/gfxFontconfigUtils.cpp|   31 +++
 gfx/thebes/gfxFontconfigUtils.h  |3 +++
 gfx/thebes/gfxGDIFontList.cpp|2 +-
 gfx/thebes/gfxMacPlatformFontList.mm |7 +++
 8 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 5eb2488..2e28fbf 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1146,6 +1146,10 @@ 
gfxDWriteFontList::GetFontsFromCollection(IDWriteFontCollection* aCollection)
 
 nsDependentString familyName(enName.Elements());
 
+if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) {
+continue;
+}
+
 fam = new gfxDWriteFontFamily(familyName, family);
 if (!fam) {
 continue;
diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp
index 671813b..da72559 100644
--- a/gfx/thebes/gfxFT2FontList.cpp
+++ b/gfx/thebes/gfxFT2FontList.cpp
@@ -1044,7 +1044,7 @@ gfxFT2FontList::AddFaceToList(const nsCString 
aEntryName, uint32_t aIndex,
 NS_ConvertUTF8toUTF16 name(aFace-family_name);
 BuildKeyNameFromFontName(name);
 gfxFontFamily *family = fontFamilies.GetWeak(name);
-if (!family) {
+if (!family  gfxFontUtils::IsFontFamilyNameAllowed(name)) {
 family = new FT2FontFamily(name);
 fontFamilies.Put(name, family);
 if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
@@ -1315,20 +1315,22 @@ gfxFT2FontList::AppendFaceFromFontListEntry(const 
FontListEntry aFLE,
 aFLE.isHidden() ? mHiddenFontFamilies : mFontFamilies;
 fe-mStandardFace = (aStdFile == kStandard);
 nsAutoString name(aFLE.familyName());
-gfxFontFamily *family = fontFamilies.GetWeak(name);
-if (!family) {
-family = new FT2FontFamily(name);
-fontFamilies.Put(name, family);
-if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
-family-SetSkipSpaceFeatureCheck(true);
-}
-if (mBadUnderlineFamilyNames.Contains(name)) {
-family-SetBadUnderlineFamily();
+if (gfxFontUtils::IsFontFamilyNameAllowed(name)) {
+gfxFontFamily *family = fontFamilies.GetWeak(name);
+if (!family) {
+family = new FT2FontFamily(name);
+fontFamilies.Put(name, family);
+if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
+family-SetSkipSpaceFeatureCheck(true);
+}
+if (mBadUnderlineFamilyNames.Contains(name)) {
+family-SetBadUnderlineFamily();
+}
 }
-}
-family-AddFontEntry(fe);
+family-AddFontEntry(fe);
 
-fe-CheckForBrokenFont(family);
+fe-CheckForBrokenFont(family);
+}
 }
 }
 
diff --git a/gfx/thebes/gfxFontUtils.cpp b/gfx/thebes/gfxFontUtils.cpp
index 094f74a..5432c7a 100644
--- a/gfx/thebes/gfxFontUtils.cpp
+++ b/gfx/thebes/gfxFontUtils.cpp
@@ -1771,3 +1771,28 @@ gfxFontUtils::IsCffFont(const uint8_t* aFontData)
 
 #endif
 
+/* static */
+nsTHashtablensStringHashKey* gfxFontUtils::sWhitelistFamilyNames = nullptr;
+
+/* static */
+bool
+gfxFontUtils::IsFontFamilyNameAllowed(const nsAString aFontFamilyName)
+{
+if (!sWhitelistFamilyNames) {
+sWhitelistFamilyNames = new nsTHashtablensStringHashKey();
+nsAutoTArraynsString, 10 list;
+GetPrefsFontList(font.system.whitelist, list);
+uint32_t numFonts = list.Length();
+for (uint32_t i = 0; i  numFonts; i++) {
+nsAutoString key;
+ToLowerCase(list[i], key);
+sWhitelistFamilyNames-PutEntry(key);
+}
+}
+nsAutoString fontFamilyNameLower;
+ToLowerCase(aFontFamilyName, fontFamilyNameLower);
+// If whitelist is empty, any family name is allowed. If whitelist
+// has entries, then only allow family names in the whitelist.
+return sWhitelistFamilyNames-Count() == 0 ||
+   sWhitelistFamilyNames-Contains(fontFamilyNameLower);
+}
diff --git a/gfx/thebes/gfxFontUtils.h b/gfx/thebes/gfxFontUtils.h
index 2da48af..18eaa2d 100644
--- a/gfx/thebes/gfxFontUtils.h
+++ b/gfx/thebes/gfxFontUtils.h
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v.

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts

2015-07-28 Thread gk

commit be6a317e6a7f028a882f6f641b7f90960e8fd239
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Mon Jul 20 08:52:24 2015 -0700

Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts
---
 gfx/thebes/gfxDWriteFontList.cpp |2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 8d0ae81..5eb2488 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1803,6 +1803,7 @@ private:
 BundledFontFileEnumerator() = delete;
 BundledFontFileEnumerator(const BundledFontFileEnumerator) = delete;
 BundledFontFileEnumerator operator=(const BundledFontFileEnumerator) = 
delete;
+virtual ~BundledFontFileEnumerator() {}
 
 nsRefPtrIDWriteFactory  mFactory;
 
@@ -1870,6 +1871,7 @@ public:
 private:
 BundledFontLoader(const BundledFontLoader) = delete;
 BundledFontLoader operator=(const BundledFontLoader) = delete;
+virtual ~BundledFontLoader() { }
 };
 
 IFACEMETHODIMP



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2015-07-28 Thread gk

commit 05e826cfabe18b243c833774a867a895e6dec5cb
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Thu Jul 16 16:32:47 2015 -0700

fixup! TB4: Tor Browser's Firefox preference overrides.
---
 browser/app/profile/000-tor-browser.js |  199 
 1 file changed, 199 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 8188855..95bc04b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -237,3 +237,202 @@ pref(security.cert_pinning.enforcement_level, 2);
 #ifdef TOR_BROWSER_VERSION
 #expand pref(torbrowser.version, __TOR_BROWSER_VERSION__);
 #endif
+
+// If we are bundling fonts, only allow bundled fonts to be used.
+#ifdef MOZ_BUNDLED_FONTS
+pref(font.default.lo, Noto Sans Lao);
+pref(font.default.my, Noto Sans Myanmar);
+pref(font.default.x-western, sans-serif);
+pref(font.internaluseonly.changed, true);
+pref(font.name-list.cursive.ar, Noto Naskh Arabic);
+pref(font.name-list.cursive.el, Noto Serif);
+pref(font.name-list.cursive.he, Noto Sans Hebrew);
+pref(font.name-list.cursive.x-cyrillic, Noto Serif);
+pref(font.name-list.cursive.x-unicode, Noto Serif, Noto Sans Canadian 
Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans 
Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao);
+pref(font.name-list.cursive.x-western, Noto Serif);
+pref(font.name-list.fantasy.ar, Noto Kufi Arabic);
+pref(font.name-list.fantasy.el, Noto Serif);
+pref(font.name-list.fantasy.he, Noto Sans Hebrew);
+pref(font.name-list.fantasy.x-cyrillic, Noto Serif);
+pref(font.name-list.fantasy.x-unicode, Noto Serif, Noto Sans Canadian 
Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans 
Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao);
+pref(font.name-list.fantasy.x-western, Noto Serif);
+pref(font.name-list.monospace.ar, Noto Kufi Arabic);
+pref(font.name-list.monospace.el, Cousine);
+pref(font.name-list.monospace.he, Noto Sans Hebrew);
+pref(font.name-list.monospace.ja, Noto Sans CJK SC Regular);
+pref(font.name-list.monospace.ko, Noto Sans CJK SC Regular);
+pref(font.name-list.monospace.th, Noto Sans Thai);
+pref(font.name-list.monospace.x-armn, Noto Sans Armenian);
+pref(font.name-list.monospace.x-beng, Noto Sans Bengali);
+pref(font.name-list.monospace.x-cyrillic, Cousine);
+pref(font.name-list.monospace.x-devanagari, Noto Sans Devanagari);
+pref(font.name-list.monospace.x-ethi, Noto Sans Ethiopic);
+pref(font.name-list.monospace.x-geor, Noto Sans Georgian);
+pref(font.name-list.monospace.x-gujr, Noto Sans Gujarati);
+pref(font.name-list.monospace.x-guru, Noto Sans Gurmukhi);
+pref(font.name-list.monospace.x-khmr, Noto Sans Khmer);
+pref(font.name-list.monospace.x-knda, Noto Sans Kannada);
+pref(font.name-list.monospace.x-mlym, Noto Sans Malayalam);
+pref(font.name-list.monospace.x-orya, Noto Sans Oriya);
+pref(font.name-list.monospace.x-sinh, Noto Sans Sinhala);
+pref(font.name-list.monospace.x-tamil, Noto Sans Tamil);
+pref(font.name-list.monospace.x-telu, Noto Sans Telugu);
+pref(font.name-list.monospace.x-tibt, Noto Sans Tibetan);
+pref(font.name-list.monospace.x-unicode, Cousine, Noto Sans Lao, Noto Sans 
Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao);
+pref(font.name-list.monospace.x-western, Cousine);
+pref(font.name-list.monospace.zh-CN, Noto Sans CJK SC Regular);
+pref(font.name-list.monospace.zh-HK, Noto Sans CJK SC Regular);
+pref(font.name-list.monospace.zh-TW, Noto Sans CJK SC Regular);
+pref(font.name-list.sans-serif.ar, Noto Naskh Arabic);
+pref(font.name-list.sans-serif.el, Noto Sans);
+pref(font.name-list.sans-serif.he, Noto Sans Hebrew);
+pref(font.name-list.sans-serif.ja, Noto Sans CJK SC Regular);
+pref(font.name-list.sans-serif.ko, Noto Sans CJK SC Regular);
+pref(font.name-list.sans-serif.th, Noto Sans Thai);
+pref(font.name-list.sans-serif.x-armn, Noto Sans Armenian);
+pref(font.name-list.sans-serif.x-beng, Noto Sans Bengali);
+pref(font.name-list.sans-serif.x-cyrillic, Noto Sans);
+pref(font.name-list.sans-serif.x-devanagari, Noto Sans Devanagari);
+pref(font.name-list.sans-serif.x-ethi, Noto Sans Ethiopic);
+pref(font.name-list.sans-serif.x-geor, Noto Sans Georgian);
+pref(font.name-list.sans-serif.x-gujr, Noto Sans Gujarati);
+pref(font.name-list.sans-serif.x-guru, Noto Sans Gurmukhi);
+pref(font.name-list.sans-serif.x-khmr, Noto Sans Khmer);
+pref(font.name-list.sans-serif.x-knda, Noto Sans Kannada);
+pref(font.name-list.sans-serif.x-mlym, Noto Sans Malayalam);
+pref(font.name-list.sans-serif.x-orya, Noto Sans Oriya);
+pref(font.name-list.sans-serif.x-sinh, Noto Sans Sinhala);
+pref(font.name-list.sans-serif.x-tamil, Noto Sans Tamil);
+pref(font.name-list.sans-serif.x-telu, Noto Sans Telugu);
+pref(font.name-list.sans-serif.x-tibt, Noto Sans Tibetan);
+pref(font.name-list.sans-serif.x-unicode, Noto Sans, Noto Sans Lao, Noto 
Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana,

[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug_11061'

2015-07-28 Thread nickm

commit 0dab1bc8127a9bfa860bec24490ab54401b96afb
Merge: cedc651 c26e310
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Jul 28 14:38:52 2015 -0400

Merge remote-tracking branch 'linus/bug_11061'

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Move the IP address note in SOCKSport.

2015-07-28 Thread nickm

commit c26e3109e2b3381ef50f3e0d46b66e03c15c90d9
Author: Linus Nordberg li...@nordberg.se
Date:   Thu Mar 12 14:58:44 2015 +0100

Move the IP address note in SOCKSport.
---
 doc/tor.1.txt |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a77cb9b..0ab431e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -961,6 +961,13 @@ The following options are useful only for clients (that 
is, if
 you. This directive can be specified multiple times to bind
 to multiple addresses/ports. (Default: 9050) +
  +
+NOTE: Although this option allows you to specify an IP address
+other than localhost, you should do so only with extreme caution.
+The SOCKS protocol is unencrypted and (as we use it)
+unauthenticated, so exposing it in this way could leak your
+information to anybody watching your network, and allow anybody
+to use your computer as an open proxy. +
+ +
 The _isolation flags_ arguments give Tor rules for which streams
 received on this SOCKSPort are allowed to share circuits with one
 another.  Recognized isolation flags are:
@@ -1001,14 +1008,6 @@ The following options are useful only for clients (that 
is, if
 **PreferIPv6**;;
 Tells exits that, if a host has both an IPv4 and an IPv6 address,
 we would prefer to connect to it via IPv6. (IPv4 is the default.) +
- +
-NOTE: Although this option allows you to specify an IP address
-other than localhost, you should do so only with extreme caution.
-The SOCKS protocol is unencrypted and (as we use it)
-unauthenticated, so exposing it in this way could leak your
-information to anybody watching your network, and allow anybody
-to use your computer as an open proxy. +
- +
 **CacheIPv4DNS**;;
 Tells the client to remember IPv4 DNS answers we receive from exit
 nodes via this connection. (On by default.)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-07-28 Thread translation

commit c543f46ab2ee6d72376f77b19d83291cccd4a8be
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 19:46:10 2015 +

Update translations for torbutton-abouttorproperties
---
 es_CO/abouttor.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es_CO/abouttor.properties b/es_CO/abouttor.properties
index d607324..9861eaa 100644
--- a/es_CO/abouttor.properties
+++ b/es_CO/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Buscar a href=%1$Ssecurely/a cona 
href=%2$SPaginainicio/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Buscar a href=%1$Ssecurely/acon a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
+aboutTor.searchDDG.search.link=https://duckduckgo.com/ 
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Buscar a href=%1$Ssecurely/a con a 
href=%2$SDesconectarme/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-07-28 Thread translation

commit 8fc8f9d42ff9ef3ba0355870253cd1b63c41850e
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 19:46:13 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 es_CO/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/es_CO/abouttor.properties b/es_CO/abouttor.properties
new file mode 100644
index 000..9861eaa
--- /dev/null
+++ b/es_CO/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Buscar a href=%1$Ssecurely/a cona 
href=%2$SPaginainicio/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Buscar a href=%1$Ssecurely/acon a 
href=%2$SDuckDuckGo/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/ 
+
+aboutTor.searchDC.privacy=Buscar a href=%1$Ssecurely/a con a 
href=%2$SDesconectarme/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor] Update translations for gettor

2015-07-28 Thread translation

commit bf312fb6b97ff32a7545e90b4b3383599b0bbd65
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 19:45:05 2015 +

Update translations for gettor
---
 es_CO/gettor.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/es_CO/gettor.po b/es_CO/gettor.po
index 1705ee2..e7eaa0c 100644
--- a/es_CO/gettor.po
+++ b/es_CO/gettor.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Andres Felipe Torres felipetorr...@hotmail.com, 2015
+# Marcela Garcia-Casteblanco marceg...@hotmail.com, 2015
 # William BeltrÃ¡n wbeltr...@gmail.com, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-07-18 19:15+\n
-Last-Translator: Andres Felipe Torres felipetorr...@hotmail.com\n
+PO-Revision-Date: 2015-07-28 19:43+\n
+Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -32,27 +33,27 @@ msgid 
 Unfortunately, we won't answer you at this address. You should make\n
 an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n
 one of those.
-msgstr Desafortunadamente, no te responderemos en esta direccion web. Deberas 
hacer\nuna cuenta con GMAIL.COM, YAHOO.COM o YAHOO.CN y enviar el correo 
desde\nuno de ellos
+msgstr Desafortunadamente, no te responderemos en esta direcciÃ³n web. 
DeberÃ¡s crear\nuna cuenta GMAIL.COM, YAHOO.COM o YAHOO.CN y enviar el correo 
desde\nuno de ellos
 
 #: lib/gettor/i18n.py:35
 msgid 
 We only process requests from email services that support \DKIM\,\n
 which is an email feature that lets us verify that the address in the\n
 \From\ line is actually the one who sent the mail.
-msgstr 
+msgstr Solamente procesamos solicitudes de servicios de correo electrÃ³nico 
que soportan \DKIM\, \nque es una funciÃ³n de correo electrÃ³nico que nos 
permite verificar que la direcciÃ³n en la\nlÃnea de \Remitente\ en realidad 
es la que enviÃ³ el correo electrÃ³nico.
 
 #: lib/gettor/i18n.py:39
 msgid 
 (We apologize if you didn't ask for this mail. Since your email is from\n
 a service that doesn't use DKIM, we're sending a short explanation,\n
 and then we'll ignore this email address for the next day or so.)
-msgstr 
+msgstr (Nos disculpamos si usted no ha solicitado este correo electrÃ³nico. 
Debido a que su correo electrÃ³nico proviene de\nun servicio que no usa DKIM, 
le enviamos una corta explicaciÃ³n\ny luego Ã©sta direcciÃ³n de correo 
electrÃ³nico serÃ¡ ignorada el siguiente dÃa, mas o menos.)
 
 #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
 msgid 
 If you have any questions or it doesn't work, you can contact a\n
 human at this support email address: h...@rt.torproject.org
-msgstr 
+msgstr Si tiene alguna pregunta o si no funciona, usted puede contactar a 
un\nhumano a la direcciÃ³n de correo electrÃ³nico de soporte: 
h...@rt.torproject.org
 
 #: lib/gettor/i18n.py:46
 msgid 
@@ -70,7 +71,7 @@ msgid 
 obfs-linux-i386\n
 obfs-linux-x86_64\n
 source
-msgstr 
+msgstr Le enviarÃ© un paquete Tor si usted me dice cual desea.\nPo favor 
seleccione uno de los siguientes nombres de 
paquete:\n\nwindows\nmacos-i386\nmacos-ppc\nlinux-i386\nlinux-x86_64\nobfs-windows\nobfs-macos-i386\nobfs-macos-x86_64\nobfs-linux-i386\nobfs-linux-x86_64\nsource\n
 
 
 #: lib/gettor/i18n.py:61
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] update translations

2015-07-28 Thread gk

commit ff0affb312a1da2c71e44db3ba240848013ee7f7
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 19:51:38 2015 +

update translations
---
 src/chrome/locale/ar/aboutDialog.dtd |   19 +++
 src/chrome/locale/ar/aboutTor.properties |   10 --
 src/chrome/locale/ar/brand.dtd   |2 +-
 src/chrome/locale/de/aboutDialog.dtd |   19 +++
 src/chrome/locale/de/aboutTor.dtd|2 +-
 src/chrome/locale/de/aboutTor.properties |   10 --
 src/chrome/locale/es/aboutDialog.dtd |   19 +++
 src/chrome/locale/es/aboutTor.properties |   16 +++-
 src/chrome/locale/eu/aboutDialog.dtd |   19 +++
 src/chrome/locale/eu/aboutTor.properties |6 ++
 src/chrome/locale/fa/aboutDialog.dtd |   19 +++
 src/chrome/locale/fa/aboutTor.properties |   10 --
 src/chrome/locale/fr/aboutDialog.dtd |   19 +++
 src/chrome/locale/fr/aboutTor.properties |   10 --
 src/chrome/locale/it/aboutDialog.dtd |   19 +++
 src/chrome/locale/it/aboutTor.properties |8 +++-
 src/chrome/locale/ja/aboutDialog.dtd |   19 +++
 src/chrome/locale/ja/aboutTor.properties |   10 --
 src/chrome/locale/ko/aboutDialog.dtd |   19 +++
 src/chrome/locale/ko/aboutTor.properties |6 ++
 src/chrome/locale/ko/torbutton.dtd   |   26 +-
 src/chrome/locale/nl/aboutDialog.dtd |   19 +++
 src/chrome/locale/nl/aboutTor.properties |   10 --
 src/chrome/locale/pl/aboutDialog.dtd |   19 +++
 src/chrome/locale/pl/aboutTor.dtd|2 +-
 src/chrome/locale/pl/aboutTor.properties |   10 --
 src/chrome/locale/pt/aboutDialog.dtd |   19 +++
 src/chrome/locale/pt/aboutTor.properties |   10 --
 src/chrome/locale/pt/torbutton.dtd   |   16 
 src/chrome/locale/ru/aboutDialog.dtd |   19 +++
 src/chrome/locale/ru/aboutTor.properties |   10 --
 src/chrome/locale/sv/aboutDialog.dtd |   19 +++
 src/chrome/locale/sv/aboutTor.properties |   10 --
 src/chrome/locale/sv/torbutton.properties|2 +-
 src/chrome/locale/tr/aboutDialog.dtd |   19 +++
 src/chrome/locale/tr/aboutTor.properties |8 +++-
 src/chrome/locale/vi/aboutDialog.dtd |   19 +++
 src/chrome/locale/vi/aboutTor.properties |6 ++
 src/chrome/locale/zh-CN/aboutDialog.dtd  |   19 +++
 src/chrome/locale/zh-CN/aboutTor.properties  |   10 --
 src/chrome/locale/zh-CN/torbutton.properties |2 +-
 41 files changed, 480 insertions(+), 55 deletions(-)

diff --git a/src/chrome/locale/ar/aboutDialog.dtd 
b/src/chrome/locale/ar/aboutDialog.dtd
new file mode 100644
index 000..2d808e6
--- /dev/null
+++ b/src/chrome/locale/ar/aboutDialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   brandShortName; is developed by 
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink the vendorShortName;
+!ENTITY project.end ÙØ§ØªÙØ¯Ù ÙÙØ±Ø¨Ø ØªØ¹ÙÙ Ø¹ÙÙ ØÙ
Ø§ÙØ© Ø®ØµÙØµÙØªÙ ÙØØ±ÙØªÙ Ø¹ÙÙ Ø§ÙØ£ÙØªØ±ÙØª
+
+!ENTITY help.start  ÙÙ ØªØ±ØºØ¨ ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©Ø
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink ØªØ¨Ø±Ø¹
+!ENTITY help.or Ø£Ù
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkØ´Ø§Ø±Ù
+!ENTITY help.endØ¹ÙØ§ÙØ© ØªØ¹Ø¬Ø¨
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Ø£Ù Ø£Ø³Ø¦ÙØ©Ø
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growØ³Ø§Ø¹Ø¯ Ø´Ø¨ÙØ© ØªÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  ÙØ¹ÙÙÙØ§Øª Ø§ÙØªØ±Ø®ÙØµ
+!ENTITY tor.TrademarkStatement   quot;ØªÙØ±quot; Ù quot;Ø´Ø¹Ø§Ø± 
Ø§ÙØ¨ØµÙØ©quot; Ø¹ÙØ§ÙØ§Øª ØªØ¬Ø§Ø±ÙØ© ÙØ³Ø¬ÙØ© Ø¨Ø§Ø³Ù Ø´Ø±ÙØ© Ù
Ø´Ø±ÙØ¹ ØªÙØ± Ø§ÙÙØØ¯ÙØ¯Ø©
diff --git a/src/chrome/locale/ar/aboutTor.properties 
b/src/chrome/locale/ar/aboutTor.properties
index 09f1f91..d607324 100644
--- a/src/chrome/locale/ar/aboutTor.properties
+++ b/src/chrome/locale/ar/aboutTor.properties

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-07-28 Thread translation

commit cb0b5756217fcf67913b10e2f2ee8f34f5e143fa
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:16:17 2015 +

Update translations for torbutton-abouttorproperties
---
 tr/abouttor.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/abouttor.properties b/tr/abouttor.properties
index a9c53ab..01b0829 100644
--- a/tr/abouttor.properties
+++ b/tr/abouttor.properties
@@ -16,6 +16,6 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
 aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+aboutTor.searchDC.privacy.link= 
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDC.search.link=https://search.disconnect.me/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2015-07-28 Thread translation

commit 31e216aef815105b27580cc63acd05ecf635f756
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:16:54 2015 +

Update translations for tor-messenger-otrproperties
---
 fr_CA/otr.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr_CA/otr.properties b/fr_CA/otr.properties
index 7abf20a..441d701 100644
--- a/fr_CA/otr.properties
+++ b/fr_CA/otr.properties
@@ -2,7 +2,7 @@ msgevent.encryption_required_part1=Vous avez tentÃ© d'envoyer 
un message non chi
 msgevent.encryption_required_part2=Tentative de dÃ©marrage d'une conversation 
privÃ©e. Votre message sera retransmis une fois qu'elle sera Ã©tablie.
 msgevent.encryption_error=Une erreur est survenue lors du chiffrement de votre 
message. Il n'a pas Ã©tÃ© envoyÃ©.
 msgevent.connection_ended=%S a dÃ©jÃ  mis fin Ã  la conversation privÃ©e avec 
vous. Votre message n'a pas Ã©tÃ© envoyÃ©. Mettez fin Ã  la conversation 
privÃ©e ou redÃ©marrez-la.
-msgevent.setup_error=An error occured while setting up a private conversation 
with %S.
+msgevent.setup_error=Une erreur est survenue lors de la mise en place d'une 
conversation privÃ©e avec %S.
 msgevent.msg_reflected=Vous recevez vos propres messages OTR. Soit vous 
essayez de vous parler, soit quelqu'un vous renvoie vos messages.
 msgevent.msg_resent=Le dernier message Ã  %S a Ã©tÃ© renvoyÃ©.
 msgevent.rcvdmsg_not_private=Le message chiffrÃ© reÃ§u de %S est illisible car 
votre communication n'est pas privÃ©e.
@@ -10,9 +10,9 @@ msgevent.rcvdmsg_unreadable=Nous avons reÃ§u un message 
chiffrÃ© illisible de %S
 msgevent.rcvdmsg_malformed=Nous avons reÃ§u un message aux donnÃ©es mal 
formÃ©es de %S.
 msgevent.log_heartbeat_rcvd=Battement de cÅur reÃ§u de %S. 
 msgevent.log_heartbeat_sent=Battement de cÅur envoyÃ© Ã  %S. 
-msgevent.rcvdmsg_general_err=An OTR error occured.
-msgevent.rcvdmsg_unecrypted=We received an unencrypted message from %S.
-msgevent.rcvdmsg_unrecognized=We received an unrecognized OTR message from %S.
+msgevent.rcvdmsg_general_err=Une erreur OTR est survenue.
+msgevent.rcvdmsg_unecrypted=Nous avons reÃ§u un message non chiffrÃ© de %S.
+msgevent.rcvdmsg_unrecognized=Nous avons reÃ§u un message OTR non reconnu de 
%S.
 msgevent.rcvdmsg_for_other_instance=%S a envoyÃ© un message destinÃ© Ã  une 
session diffÃ©rente. Si vous Ãªtes connectÃ© plusieurs fois, une autre session 
pourrait avoir reÃ§u le message.
 context.gone_secure_private=Conversation privÃ©e dÃ©marrÃ©e avec %S.
 context.gone_secure_unverified=Conversation privÃ©e dÃ©marrÃ©e avec %S. 
Cependant son identitÃ© n'a pas Ã©tÃ© vÃ©rifiÃ©e.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2015-07-28 Thread translation

commit b8d6a3c44566dedf40710db1d9e8c29478267ad1
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:17:05 2015 +

Update translations for tor-messenger-prefsdtd
---
 fr_CA/prefs.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd
index 7c47a04..b6ca6cf 100644
--- a/fr_CA/prefs.dtd
+++ b/fr_CA/prefs.dtd
@@ -7,7 +7,7 @@
 !ENTITY prefs.knownFingers Empreintes connues
 !ENTITY prefs.introFingers GÃ©rez la liste d'empreintes que vous avez 
visualisÃ©es.
 !ENTITY prefs.showFingers Visualiser
-!ENTITY prefs.introSettings These settings apply to all one-to-one 
conversations.
+!ENTITY prefs.introSettings Ces parametres s'appliquent Ã  toutes les 
conversations un Ã  un.
 !ENTITY prefs.verifyNudge Toujours donner un coup de coude pour vÃ©rifier 
l'identitÃ© de votre contact
 !ENTITY prefs.emptyAccountList Aucun compte n'est configurÃ©
 !ENTITY prefs.generate GÃ©nÃ©rer
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2015-07-28 Thread translation

commit f44eb788e7b8c6d334d54aa4a073c407a78a03d3
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:17:15 2015 +

Update translations for tor-messenger-prefsdtd_completed
---
 fr_CA/prefs.dtd |   13 +
 1 file changed, 13 insertions(+)

diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd
new file mode 100644
index 000..b6ca6cf
--- /dev/null
+++ b/fr_CA/prefs.dtd
@@ -0,0 +1,13 @@
+!ENTITY prefs.otrPreferences PrÃ©fÃ©rences OTR
+!ENTITY prefs.otrSettings ParamÃ¨tres OTR
+!ENTITY prefs.requireEncryption Exiger le chiffrement
+!ENTITY prefs.otrKeys Mes clefs privÃ©es
+!ENTITY prefs.keyForAccount Clef du compte
+!ENTITY prefs.fingerprint Empreinte :
+!ENTITY prefs.knownFingers Empreintes connues
+!ENTITY prefs.introFingers GÃ©rez la liste d'empreintes que vous avez 
visualisÃ©es.
+!ENTITY prefs.showFingers Visualiser
+!ENTITY prefs.introSettings Ces parametres s'appliquent Ã  toutes les 
conversations un Ã  un.
+!ENTITY prefs.verifyNudge Toujours donner un coup de coude pour vÃ©rifier 
l'identitÃ© de votre contact
+!ENTITY prefs.emptyAccountList Aucun compte n'est configurÃ©
+!ENTITY prefs.generate GÃ©nÃ©rer
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2015-07-28 Thread translation

commit 9ef5503deae9bd751ccd0f38da47bd47e844e0c2
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:16:58 2015 +

Update translations for tor-messenger-otrproperties_completed
---
 fr_CA/otr.properties |   31 +++
 1 file changed, 31 insertions(+)

diff --git a/fr_CA/otr.properties b/fr_CA/otr.properties
new file mode 100644
index 000..441d701
--- /dev/null
+++ b/fr_CA/otr.properties
@@ -0,0 +1,31 @@
+msgevent.encryption_required_part1=Vous avez tentÃ© d'envoyer un message non 
chiffrÃ© Ã  %S. Toutefois, ils ne sont pas permis.
+msgevent.encryption_required_part2=Tentative de dÃ©marrage d'une conversation 
privÃ©e. Votre message sera retransmis une fois qu'elle sera Ã©tablie.
+msgevent.encryption_error=Une erreur est survenue lors du chiffrement de votre 
message. Il n'a pas Ã©tÃ© envoyÃ©.
+msgevent.connection_ended=%S a dÃ©jÃ  mis fin Ã  la conversation privÃ©e avec 
vous. Votre message n'a pas Ã©tÃ© envoyÃ©. Mettez fin Ã  la conversation 
privÃ©e ou redÃ©marrez-la.
+msgevent.setup_error=Une erreur est survenue lors de la mise en place d'une 
conversation privÃ©e avec %S.
+msgevent.msg_reflected=Vous recevez vos propres messages OTR. Soit vous 
essayez de vous parler, soit quelqu'un vous renvoie vos messages.
+msgevent.msg_resent=Le dernier message Ã  %S a Ã©tÃ© renvoyÃ©.
+msgevent.rcvdmsg_not_private=Le message chiffrÃ© reÃ§u de %S est illisible car 
votre communication n'est pas privÃ©e.
+msgevent.rcvdmsg_unreadable=Nous avons reÃ§u un message chiffrÃ© illisible de 
%S.
+msgevent.rcvdmsg_malformed=Nous avons reÃ§u un message aux donnÃ©es mal 
formÃ©es de %S.
+msgevent.log_heartbeat_rcvd=Battement de cÅur reÃ§u de %S. 
+msgevent.log_heartbeat_sent=Battement de cÅur envoyÃ© Ã  %S. 
+msgevent.rcvdmsg_general_err=Une erreur OTR est survenue.
+msgevent.rcvdmsg_unecrypted=Nous avons reÃ§u un message non chiffrÃ© de %S.
+msgevent.rcvdmsg_unrecognized=Nous avons reÃ§u un message OTR non reconnu de 
%S.
+msgevent.rcvdmsg_for_other_instance=%S a envoyÃ© un message destinÃ© Ã  une 
session diffÃ©rente. Si vous Ãªtes connectÃ© plusieurs fois, une autre session 
pourrait avoir reÃ§u le message.
+context.gone_secure_private=Conversation privÃ©e dÃ©marrÃ©e avec %S.
+context.gone_secure_unverified=Conversation privÃ©e dÃ©marrÃ©e avec %S. 
Cependant son identitÃ© n'a pas Ã©tÃ© vÃ©rifiÃ©e.
+context.still_secure=La conversation privÃ©e avec %S a Ã©tÃ© rafraÃ®chie avec 
succÃ¨s.
+error.enc=Une erreur est survenue lors du chiffrement du message.
+error.not_priv=Vous avez envoyÃ© des donnÃ©es chiffrÃ©es Ã  %S qui ne s'y 
attendait pas.
+error.unreadable=Vous avez transmis un message chiffrÃ© illisible.
+error.malformed=Vous avez transmis un message aux donnÃ©es mal formÃ©es.
+resent=[renvoyÃ©]
+tlv.disconnected=%S a mis fin Ã  la conversation privÃ©e avec vous; vous 
devriez en faire autant.
+query.msg=%S a demandÃ© un conversation confidentielle OTR. Cependant vous 
n'avez aucun plugiciel pour ce faire. Consultez http://otr.cypherpunks.ca/ pour 
plus d'informations.
+trust.unused=InutilisÃ©
+trust.not_private=Non privÃ©e
+trust.unverified=Non vÃ©rifiÃ©e
+trust.private=PrivÃ©e
+trust.finished=TerminÃ©e

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2015-07-28 Thread translation

commit 24aa8ac4aa71233084f7403bbef9a45f01932d4f
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:16:48 2015 +

Update translations for tor-messenger-ircproperties
---
 fr_CA/irc.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties
index 53d57bf..f881458 100644
--- a/fr_CA/irc.properties
+++ b/fr_CA/irc.properties
@@ -53,7 +53,7 @@ command.chanserv=%S lt;commandgt; : envoyer une commande Ã  
ChanServ.
 command.deop=%S lt;pseudo1gt;[,lt;pseudo2gt;]* : retirer Ã  quelqu'un le 
statut d'opÃ©rateur de canal. Vous devez Ãªtre un opÃ©rateur de canal pour le 
faire.
 command.devoice=%S lt;pseudo1gt;[,lt;pseudo2gt;]* : retirer le statut 
vocal de quelqu'un pour un canal, l'empÃªchant de parler si le canal est 
modÃ©rÃ© (+m). Vous devez Ãªtre un opÃ©rateur de canal pour le faire.
 command.invite2=%S lt;pseudogt;[ lt;pseudogt;]* [lt;canalgt;] : invitez 
un ou plusieurs pseudos Ã  vous rejoindre dans le canal actuel ou dans le canal 
spÃ©cifiÃ©.
-command.join=%S lt;salon1gt;[ lt;clef1gt;][,lt;salon2gt;[ 
lt;clef2gt;]]* : saisir un ou plusieurs canaux, en fournissant 
facultativement une clef de canal pour chacun si nÃ©cessaire.
+command.join=%S lt;clavadoir1gt;[ lt;clef1gt;][,lt;clavadoir2gt;[ 
lt;clef2gt;]]* : saisir un ou plusieurs canaux, en fournissant 
facultativement une clef de canal pour chacun si nÃ©cessaire.
 command.kick=%S lt;pseudogt; [lt;messagegt;] : retirer quelqu'un d'un 
canal. Vous devez Ãªtre un opÃ©rateur de canal pour le faire.
 command.list=%S : afficher une liste de clavardoirs sur le rÃ©seau. 
Avertissement, certains serveurs pourraient vous dÃ©connecter aprÃ¨s cela.
 command.memoserv=%S lt;commandegt; : envoyer une commande Ã  MemoServ.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2015-07-28 Thread translation

commit 2eb1b057a929d3ece0b53fb7f2a774338b656ec1
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 21:16:51 2015 +

Update translations for tor-messenger-ircproperties_completed
---
 fr_CA/irc.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties
index 53d57bf..f881458 100644
--- a/fr_CA/irc.properties
+++ b/fr_CA/irc.properties
@@ -53,7 +53,7 @@ command.chanserv=%S lt;commandgt; : envoyer une commande Ã  
ChanServ.
 command.deop=%S lt;pseudo1gt;[,lt;pseudo2gt;]* : retirer Ã  quelqu'un le 
statut d'opÃ©rateur de canal. Vous devez Ãªtre un opÃ©rateur de canal pour le 
faire.
 command.devoice=%S lt;pseudo1gt;[,lt;pseudo2gt;]* : retirer le statut 
vocal de quelqu'un pour un canal, l'empÃªchant de parler si le canal est 
modÃ©rÃ© (+m). Vous devez Ãªtre un opÃ©rateur de canal pour le faire.
 command.invite2=%S lt;pseudogt;[ lt;pseudogt;]* [lt;canalgt;] : invitez 
un ou plusieurs pseudos Ã  vous rejoindre dans le canal actuel ou dans le canal 
spÃ©cifiÃ©.
-command.join=%S lt;salon1gt;[ lt;clef1gt;][,lt;salon2gt;[ 
lt;clef2gt;]]* : saisir un ou plusieurs canaux, en fournissant 
facultativement une clef de canal pour chacun si nÃ©cessaire.
+command.join=%S lt;clavadoir1gt;[ lt;clef1gt;][,lt;clavadoir2gt;[ 
lt;clef2gt;]]* : saisir un ou plusieurs canaux, en fournissant 
facultativement une clef de canal pour chacun si nÃ©cessaire.
 command.kick=%S lt;pseudogt; [lt;messagegt;] : retirer quelqu'un d'un 
canal. Vous devez Ãªtre un opÃ©rateur de canal pour le faire.
 command.list=%S : afficher une liste de clavardoirs sur le rÃ©seau. 
Avertissement, certains serveurs pourraient vous dÃ©connecter aprÃ¨s cela.
 command.memoserv=%S lt;commandegt; : envoyer une commande Ã  MemoServ.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug 16884: Prefer IPv6 if available in Tor Browser

2015-07-28 Thread gk

commit 1f39acfbe083e3fac156345253b76ba785147ea9
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 22:45:03 2015 +

Bug 16884: Prefer IPv6 if available in Tor Browser
---
 Bundle-Data/linux/Data/Tor/torrc-defaults  |2 +-
 Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults |2 +-
 Bundle-Data/windows/Data/Tor/torrc-defaults|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults 
b/Bundle-Data/linux/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults 
b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
+++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults 
b/Bundle-Data/windows/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2015-07-28 Thread translation

commit 2076ee859958ba8ae7dee91a7d42f92e206ef657
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 20:46:42 2015 +

Update translations for tor-messenger-ircproperties
---
 tr/irc.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/irc.properties b/tr/irc.properties
index dd3ba94..0be8158 100644
--- a/tr/irc.properties
+++ b/tr/irc.properties
@@ -97,9 +97,9 @@ message.channelmode=Kanal modu %1$S %2$S tarafÄ±ndan 
ayarlandÄ±.
 #%S is the user's mode.
 message.yourmode=Modunuz %S.
 #%1$S is the old nick and %2$S is the new nick.
-message.nick=%1$S is now known as %2$S.
+message.nick=%1$S, %2$S olarak biliniyor.
 #%S is your new nick.
-message.nick.you=You are now known as %S.
+message.nick.you=Åuanda %S olarak biliniyorsunuz.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=Ä°stenen takma ad kullanÄ±lamadÄ±. Takma adÄ±nÄ±z %S olarak 
kaldÄ±.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-07-28 Thread translation

commit ef63016d0dac0d9c5ff4688d81b759f419492cd5
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 20:46:12 2015 +

Update translations for torbutton-abouttorproperties
---
 fr_CA/abouttor.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr_CA/abouttor.properties b/fr_CA/abouttor.properties
index 3bfec1d..80d7b31 100644
--- a/fr_CA/abouttor.properties
+++ b/fr_CA/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/fra/?
+aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2015-07-28 Thread translation

commit 716058096205d446753192ce2972253c70819eac
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 20:46:45 2015 +

Update translations for tor-messenger-ircproperties_completed
---
 tr/irc.properties |4 
 1 file changed, 4 insertions(+)

diff --git a/tr/irc.properties b/tr/irc.properties
index 462a3f5..0be8158 100644
--- a/tr/irc.properties
+++ b/tr/irc.properties
@@ -96,6 +96,10 @@ message.usermode=%1$S modu %2$S iÃ§in %3$S tarafÄ±ndan 
ayarlandÄ±.
 message.channelmode=Kanal modu %1$S %2$S tarafÄ±ndan ayarlandÄ±.
 #%S is the user's mode.
 message.yourmode=Modunuz %S.
+#%1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S, %2$S olarak biliniyor.
+#%S is your new nick.
+message.nick.you=Åuanda %S olarak biliniyorsunuz.
 #Could not change the nickname. %S is the user's nick.
 message.nick.fail=Ä°stenen takma ad kullanÄ±lamadÄ±. Takma adÄ±nÄ±z %S olarak 
kaldÄ±.
 #The parameter is the message.parted.reason, if a part message is given.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-07-28 Thread translation

commit 63c9e9a0fc06edcddba596f37ed53ff3f2ac2788
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 20:46:18 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 fr_CA/abouttor.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr_CA/abouttor.properties b/fr_CA/abouttor.properties
index 3bfec1d..80d7b31 100644
--- a/fr_CA/abouttor.properties
+++ b/fr_CA/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/fra/?
+aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Recherchez a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Rechercher a href=%1$Sen toute sÃ©curitÃ©/a 
avec a href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] bump version and update changelog

2015-07-28 Thread gk

commit d400aecd466dd7397397857d8bb31e5730e1a125
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 28 20:49:09 2015 +

bump version and update changelog
---
 src/CHANGELOG   |6 ++
 src/install.rdf |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index c49bea3..ccee56d 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,9 @@
+1.9.3.1
+ * Bug 16268: Show Tor Browser logo on About page
+ * Bug 16639: Check for Updates menu item can cause update failure
+ * Bug 15781: Remove the sessionstore filter
+ * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref
+
 1.9.3.0
  * Bug 16427: Use internal update URL
  * Bug 16200: Update Cache API usage and prefs for FF38
diff --git a/src/install.rdf b/src/install.rdf
index 488d039..4fd6fbe 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 em:nameTorbutton/em:name
 em:creatorMike Perry/em:creator
 em:idtorbut...@torproject.org/em:id
-em:version1.9.3.0/em:version
+em:version1.9.3.1/em:version
 
em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en/em:homepageURL
 
em:optionsURLchrome://torbutton/content/preferences.xul/em:optionsURL
 em:iconURLchrome://torbutton/skin/tor.png/em:iconURL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor] Update translations for gettor

2015-07-28 Thread translation

commit 88bbf68b512bc10945c02207baa0aa3958444925
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 20:15:07 2015 +

Update translations for gettor
---
 es_CO/gettor.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es_CO/gettor.po b/es_CO/gettor.po
index e7eaa0c..ce7a661 100644
--- a/es_CO/gettor.po
+++ b/es_CO/gettor.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-07-28 19:43+\n
+PO-Revision-Date: 2015-07-28 19:52+\n
 Last-Translator: Marcela Garcia-Casteblanco marceg...@hotmail.com\n
 Language-Team: Spanish (Colombia) 
(http://www.transifex.com/projects/p/torproject/language/es_CO/)\n
 MIME-Version: 1.0\n
@@ -77,13 +77,13 @@ msgstr Le enviarÃ© un paquete Tor si usted me dice cual 
desea.\nPo favor selecc
 msgid 
 Please reply to this mail, and tell me a single package name anywhere \n
 in the body of your email.
-msgstr 
+msgstr Por favor responda a Ã©ste correo y escriba el nombre de un paquete 
sencillo en cualquier parte \ndel cuerpo de su mensaje de correo electrÃ³nico.
 
 #: lib/gettor/i18n.py:64
 msgid 
 OBTAINING LOCALIZED VERSIONS OF TOR\n
 ===
-msgstr 
+msgstr OBTENIENDO VERSIONES LOCALIZADAS DE 
TOR\n===
 
 #: lib/gettor/i18n.py:67
 msgid 
@@ -91,7 +91,7 @@ msgid 
 language you want in the address you send the mail to:\n
 \n
 gettor...@torproject.org
-msgstr 
+msgstr Para obtener una versiÃ³n traducida de Tor en su lenguaje, especifique 
el\nlenguaje que desea, en la direcciÃ³n que usted envÃa en el correo 
a:\n\ngettor...@torproject.org 
 
 #: lib/gettor/i18n.py:72
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback] Update translations for whisperback

2015-07-28 Thread translation

commit 6d6574d5785d1f3b9c2be36e7ad5690ecf0a84ea
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:17 2015 +

Update translations for whisperback
---
 tr/tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 79c7d7c..af8bfb4 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -14,8 +14,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-03-17 17:40+0100\n
-PO-Revision-Date: 2015-06-20 14:58+\n
-Last-Translator: Bullgeschichte bullgeschic...@riseup.net\n
+PO-Revision-Date: 2015-07-28 21:51+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2015-07-28 Thread translation

commit e0b6c1804eec6fefb0a52b543b1430bb145129ae
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:53 2015 +

Update translations for mat-gui
---
 tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.po b/tr.po
index e170dba..cade5b0 100644
--- a/tr.po
+++ b/tr.po
@@ -11,8 +11,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-12-31 04:53+0100\n
-PO-Revision-Date: 2015-07-25 13:10+\n
-Last-Translator: Volkan Gezer volkange...@gmail.com\n
+PO-Revision-Date: 2015-07-28 21:53+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor] Update translations for gettor

2015-07-28 Thread translation

commit fbb74df7525c7ddad2076ce67d36413278e4e3a0
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:06 2015 +

Update translations for gettor
---
 tr/gettor.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tr/gettor.po b/tr/gettor.po
index 71fc97a..aca2bf7 100644
--- a/tr/gettor.po
+++ b/tr/gettor.po
@@ -10,14 +10,15 @@
 # Jacob Appelbaum ja...@appelbaum.net, 2009
 # meu m...@emrahunsur.com, 2014
 # monolifed, 2014
+# Ozancan KarataÅ ozancankarata...@outlook.com, 2015
 # Volkan Gezer volkange...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-04-29 12:14+\n
-Last-Translator: Bullgeschichte bullgeschic...@riseup.net\n
+PO-Revision-Date: 2015-07-28 21:51+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -27,7 +28,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:27
 msgid Hello, This is the \GetTor\ robot.
-msgstr Selam, ben \GetTor\ robotu.
+msgstr Merhaba, bu \GetTor\ robotu.
 
 #: lib/gettor/i18n.py:29
 msgid Thank you for your request.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2015-07-28 Thread translation

commit f6143c1db91ae7462d5003bcbd08ae1a71630cdf
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:57 2015 +

Update translations for mat-gui_completed
---
 tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.po b/tr.po
index e170dba..cade5b0 100644
--- a/tr.po
+++ b/tr.po
@@ -11,8 +11,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-12-31 04:53+0100\n
-PO-Revision-Date: 2015-07-25 13:10+\n
-Last-Translator: Volkan Gezer volkange...@gmail.com\n
+PO-Revision-Date: 2015-07-28 21:53+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor_completed] Update translations for gettor_completed

2015-07-28 Thread translation

commit dd886895d20d2d6c0fc5a6b9aa58c176df204db4
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:11 2015 +

Update translations for gettor_completed
---
 tr/gettor.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tr/gettor.po b/tr/gettor.po
index 71fc97a..aca2bf7 100644
--- a/tr/gettor.po
+++ b/tr/gettor.po
@@ -10,14 +10,15 @@
 # Jacob Appelbaum ja...@appelbaum.net, 2009
 # meu m...@emrahunsur.com, 2014
 # monolifed, 2014
+# Ozancan KarataÅ ozancankarata...@outlook.com, 2015
 # Volkan Gezer volkange...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-04-29 12:14+\n
-Last-Translator: Bullgeschichte bullgeschic...@riseup.net\n
+PO-Revision-Date: 2015-07-28 21:51+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -27,7 +28,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:27
 msgid Hello, This is the \GetTor\ robot.
-msgstr Selam, ben \GetTor\ robotu.
+msgstr Merhaba, bu \GetTor\ robotu.
 
 #: lib/gettor/i18n.py:29
 msgid Thank you for your request.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2015-07-28 Thread translation

commit 1e264f7e1a4836781235645f296a0769391a6aa0
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:41 2015 +

Update translations for tails-persistence-setup_completed
---
 tr/tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 36d723b..21043e8 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -12,8 +12,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2015-05-02 21:08+0200\n
-PO-Revision-Date: 2015-07-25 14:01+\n
-Last-Translator: Volkan Gezer volkange...@gmail.com\n
+PO-Revision-Date: 2015-07-28 21:53+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-07-28 Thread translation

commit 7038a364327aee6da1787ff97c2115c79b843850
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:37 2015 +

Update translations for tails-persistence-setup
---
 tr/tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 36d723b..21043e8 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -12,8 +12,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2015-05-02 21:08+0200\n
-PO-Revision-Date: 2015-07-25 14:01+\n
-Last-Translator: Volkan Gezer volkange...@gmail.com\n
+PO-Revision-Date: 2015-07-28 21:53+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed

2015-07-28 Thread translation

commit ccd3af9a0d77f2eddccaf9a5d0bbd2a3d5c64432
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 28 22:15:20 2015 +

Update translations for whisperback_completed
---
 tr/tr.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 79c7d7c..af8bfb4 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -14,8 +14,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-03-17 17:40+0100\n
-PO-Revision-Date: 2015-06-20 14:58+\n
-Last-Translator: Bullgeschichte bullgeschic...@riseup.net\n
+PO-Revision-Date: 2015-07-28 21:51+\n
+Last-Translator: Ozancan KarataÅ ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

79 matches

Mail list logo