date:20151013

[tor-commits] [tor-messenger-build/master] Add patch for hiding 'Get more protocols...' link

2015-10-13 Thread sukhbir

commit 1fc664326ebf47237a087f2660b3ab68622b2c7e
Author: Sukhbir Singh 
Date:   Tue Oct 13 23:13:26 2015 -0400

Add patch for hiding 'Get more protocols...' link
---
 projects/instantbird/config   |1 +
 projects/instantbird/hide-get-protocols.patch |   12 
 2 files changed, 13 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 7eae10e..6b45a42 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -74,6 +74,7 @@ input_files:
   - filename: disable-links.patch
   - filename: account-picture.patch
   - filename: show-traffic-tor.patch
+  - filename: hide-get-protocols.patch
   - filename: theme-extension-update.patch
   - filename: ctcp-time.patch
   - filename: ctcp-ping.patch
diff --git a/projects/instantbird/hide-get-protocols.patch 
b/projects/instantbird/hide-get-protocols.patch
new file mode 100644
index 000..0a06be1
--- /dev/null
+++ b/projects/instantbird/hide-get-protocols.patch
@@ -0,0 +1,12 @@
+diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
+--- a/im/content/accountWizard.xul
 b/im/content/accountWizard.xul
+@@ -50,7 +50,7 @@
+ 
+ 
+-  
+ 
+   

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

[tor-commits] [torbutton/master] Bug 9263: Spoof referer when leaving a .onion domain

2015-10-13 Thread gk

commit f98243cfed952d1a1375fb1f486d728e6ca1bd44
Author: Yan Zhu 
Date:   Tue Jul 29 17:36:27 2014 -0700

Bug 9263: Spoof referer when leaving a .onion domain
---
 makexpi.sh  |2 +-
 src/chrome.manifest |   15 +--
 src/components/tor-protocol.js  |  103 --
 src/components/torRefSpoofer.js |  103 ++
 src/components/tors-protocol.js |  103 --
 src/components/window-mapper.js |  180 ---
 src/defaults/preferences/preferences.js |1 -
 7 files changed, 39 insertions(+), 468 deletions(-)

diff --git a/makexpi.sh b/makexpi.sh
index 4d01e2c..243fbd6 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -21,7 +21,7 @@ echo -- create $APP_NAME.xpi --
 mkdir -p pkg
 cd src
 echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*"
-zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x 
"components/torRefSpoofer.js" #-x "chrome/*"
+zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*"
 #mv ../$APP_NAME.jar ./chrome
 #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar
 cd ..
diff --git a/src/chrome.manifest b/src/chrome.manifest
index ddf582e..1d3efb4 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -159,18 +159,11 @@ contract @torproject.org/torbutton-logger;1 
{f36d72c9-9718-4134-b550-e109638331d
 component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js
 contract @torproject.org/domain-isolator;1 
{e33fd6d4-270f-475f-a96f-ff3140279f68}
 
-# component {b985e49c-12cb-4f29-9d14-b62603332ec4} components/window-mapper.js
-# contract @torproject.org/content-window-mapper;1 
{b985e49c-12cb-4f29-9d14-b62603332ec4}
-
-# component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
-# contract @torproject.org/torRefSpoofer;1 
{65be2be0-ceb4-44c2-91a5-9c75c53430bf}
-
-# component {52183e20-4d4b-11de-8a39-0800200c9a66} components/tor-protocol.js
-# contract @mozilla.org/network/protocol;1?name=tor 
{52183e20-4d4b-11de-8a39-0800200c9a66}
+category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
 
-# component {a5a4bc50-5e8d-11de-8a39-0800200c9a66} components/tors-protocol.js
-# contract @mozilla.org/network/protocol;1?name=tors 
{a5a4bc50-5e8d-11de-8a39-0800200c9a66}
+component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
+contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf}
 
-category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
+category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1
 category profile-after-change StartupObserver 
@torproject.org/startup-observer;1
 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
diff --git a/src/components/tor-protocol.js b/src/components/tor-protocol.js
deleted file mode 100644
index 4ba5cf4..000
--- a/src/components/tor-protocol.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Bug 1506 P0: This code is toggle-mode code and is unused. Kill it.
-
-// Test protocol related
-const kSCHEME = "tor";
-const kPROTOCOL_NAME = "tor";
-const kPROTOCOL_CONTRACTID = "@mozilla.org/network/protocol;1?name=" + kSCHEME;
-const kPROTOCOL_CID = Components.ID("52183e20-4d4b-11de-8a39-0800200c9a66");
-
-// Mozilla defined
-const kSIMPLEURI_CONTRACTID = "@mozilla.org/network/simple-uri;1";
-const kIOSERVICE_CONTRACTID = "@mozilla.org/network/io-service;1";
-const nsISupports = Components.interfaces.nsISupports;
-const nsIIOService = Components.interfaces.nsIIOService;
-const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
-const nsIURI = Components.interfaces.nsIURI;
-
-function Protocol()
-{
-}
-
-Protocol.prototype =
-{
-  QueryInterface: function(iid)
-  {
-if (!iid.equals(nsIProtocolHandler) &&
-!iid.equals(nsISupports))
-  throw Components.results.NS_ERROR_NO_INTERFACE;
-return this;
-  },
-
-  scheme: kSCHEME,
-  defaultPort: -1,
-  protocolFlags: nsIProtocolHandler.URI_NORELATIVE |
- nsIProtocolHandler.URI_NOAUTH,
-  
-  allowPort: function(port, scheme)
-  {
-return false;
-  },
-
-  newURI: function(spec, charset, baseURI)
-  {
-const nsIStandardURL = Components.interfaces.nsIStandardURL;
-var uri = 
Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIStandardURL);
-uri.init(nsIStandardURL.URLTYPE_STANDARD, 80, spec, charset, baseURI);
-
-return uri.QueryInterface(Components.interfaces.nsIURI);
-
-  },
-
-  newChannel: function(aURI)
-  {
-var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-.getService(Components.interfaces.nsIPrefBranch);
-if (!prefs.getBoolPref("extensions.torbutton.tor_urls")) {
-  throw Components.results.NS_ERROR_UNKNOWN_PROTOCOL;
-}
-
-/*The protocol has been called, therefore we want to enable tor, wait for 
it to activate

[tor-commits] [torbutton/master] Revert "remove obsolete files, re Bug 1506 P0"

2015-10-13 Thread gk

commit 9fe9cdfe816ed030e615643e35b9e0dcaa5a8635
Author: Yan Zhu 
Date:   Tue Jul 29 17:08:36 2014 -0700

Revert "remove obsolete files, re Bug 1506 P0"

This reverts commit 80b06cdf422238f5eece38a1974d31e6e7be7a17.
---
 src/chrome.manifest |   12 +++
 src/components/tor-protocol.js  |  103 ++
 src/components/torRefSpoofer.js |  125 +++
 src/components/tors-protocol.js |  103 ++
 src/components/window-mapper.js |  180 +++
 5 files changed, 523 insertions(+)

diff --git a/src/chrome.manifest b/src/chrome.manifest
index 8323e66..ddf582e 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -159,6 +159,18 @@ contract @torproject.org/torbutton-logger;1 
{f36d72c9-9718-4134-b550-e109638331d
 component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js
 contract @torproject.org/domain-isolator;1 
{e33fd6d4-270f-475f-a96f-ff3140279f68}
 
+# component {b985e49c-12cb-4f29-9d14-b62603332ec4} components/window-mapper.js
+# contract @torproject.org/content-window-mapper;1 
{b985e49c-12cb-4f29-9d14-b62603332ec4}
+
+# component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
+# contract @torproject.org/torRefSpoofer;1 
{65be2be0-ceb4-44c2-91a5-9c75c53430bf}
+
+# component {52183e20-4d4b-11de-8a39-0800200c9a66} components/tor-protocol.js
+# contract @mozilla.org/network/protocol;1?name=tor 
{52183e20-4d4b-11de-8a39-0800200c9a66}
+
+# component {a5a4bc50-5e8d-11de-8a39-0800200c9a66} components/tors-protocol.js
+# contract @mozilla.org/network/protocol;1?name=tors 
{a5a4bc50-5e8d-11de-8a39-0800200c9a66}
+
 category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
 category profile-after-change StartupObserver 
@torproject.org/startup-observer;1
 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
diff --git a/src/components/tor-protocol.js b/src/components/tor-protocol.js
new file mode 100644
index 000..4ba5cf4
--- /dev/null
+++ b/src/components/tor-protocol.js
@@ -0,0 +1,103 @@
+// Bug 1506 P0: This code is toggle-mode code and is unused. Kill it.
+
+// Test protocol related
+const kSCHEME = "tor";
+const kPROTOCOL_NAME = "tor";
+const kPROTOCOL_CONTRACTID = "@mozilla.org/network/protocol;1?name=" + kSCHEME;
+const kPROTOCOL_CID = Components.ID("52183e20-4d4b-11de-8a39-0800200c9a66");
+
+// Mozilla defined
+const kSIMPLEURI_CONTRACTID = "@mozilla.org/network/simple-uri;1";
+const kIOSERVICE_CONTRACTID = "@mozilla.org/network/io-service;1";
+const nsISupports = Components.interfaces.nsISupports;
+const nsIIOService = Components.interfaces.nsIIOService;
+const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
+const nsIURI = Components.interfaces.nsIURI;
+
+function Protocol()
+{
+}
+
+Protocol.prototype =
+{
+  QueryInterface: function(iid)
+  {
+if (!iid.equals(nsIProtocolHandler) &&
+!iid.equals(nsISupports))
+  throw Components.results.NS_ERROR_NO_INTERFACE;
+return this;
+  },
+
+  scheme: kSCHEME,
+  defaultPort: -1,
+  protocolFlags: nsIProtocolHandler.URI_NORELATIVE |
+ nsIProtocolHandler.URI_NOAUTH,
+  
+  allowPort: function(port, scheme)
+  {
+return false;
+  },
+
+  newURI: function(spec, charset, baseURI)
+  {
+const nsIStandardURL = Components.interfaces.nsIStandardURL;
+var uri = 
Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIStandardURL);
+uri.init(nsIStandardURL.URLTYPE_STANDARD, 80, spec, charset, baseURI);
+
+return uri.QueryInterface(Components.interfaces.nsIURI);
+
+  },
+
+  newChannel: function(aURI)
+  {
+var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+.getService(Components.interfaces.nsIPrefBranch);
+if (!prefs.getBoolPref("extensions.torbutton.tor_urls")) {
+  throw Components.results.NS_ERROR_UNKNOWN_PROTOCOL;
+}
+
+/*The protocol has been called, therefore we want to enable tor, wait for 
it to activate return the new channel with the scheme of http.*/
+var ios = 
Components.classes[kIOSERVICE_CONTRACTID].getService(nsIIOService);
+var prompt = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+.getService(Components.interfaces.nsIPromptService);
+var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled");
+var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+var chrome = wm.getMostRecentWindow("navigator:browser");
+if (!ios.allowPort(aURI.port, aURI.scheme))
+  throw Components.results.NS_ERROR_FAILURE;
+
+if (!tor_enabled)
+{
+  var result = prompt.confirm(null, "Allow Tor toggle?", "Do you want to 
enable Tor and navigate to " + aURI.spec + "?");   
+  if (!result)
+throw

[tor-commits] [tor-browser-bundle/master] Revert "Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes""

2015-10-13 Thread gk

commit 21a4618ade947a8dac9b422f4be3e0945388967a
Author: Georg Koppen 
Date:   Mon Oct 12 09:53:27 2015 +

Revert "Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes""

This reverts commit 2b50a8cb7d2f4e43f41f82c13704b9af15ba6b4e.
---
 gitian/README.build  |2 +-
 gitian/check-prerequisites.sh|   25 -
 gitian/descriptors/linux/gitian-bundle.yml   |   18 --
 gitian/descriptors/mac/gitian-bundle.yml |   18 --
 gitian/descriptors/windows/gitian-bundle.yml |   18 --
 gitian/fetch-inputs.sh   |9 -
 gitian/versions  |2 +-
 gitian/versions.alpha|2 +-
 gitian/versions.beta |2 +-
 9 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/gitian/README.build b/gitian/README.build
index 656..f289791 100644
--- a/gitian/README.build
+++ b/gitian/README.build
@@ -1,6 +1,6 @@
 QuickStart:
 
- On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run:
+ On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run:
 
  $ make
 
diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index 32c9b7b..cc16d0e 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -6,7 +6,7 @@ if [ ! -f /etc/debian_version ];
 then
   echo "Gitian is dependent upon the Ubuntu Virtualization Tools."
   echo
-  echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer."
+  echo "You need to run Ubuntu 14.04 LTS/Debian Wheezy or newer."
   exit 1
 fi
 
@@ -14,15 +14,22 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'`
 
 if [ $DISTRO = "Ubuntu" ];
 then
-  dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what 
lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null 
>/dev/null
-
-  if [ $? -ne 0 ];
+  VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1`
+  if [ "$VERSION" -ge "14" ];
   then
-echo "You are missing one or more Gitian build tool dependencies."
-echo
-echo "Please run:"
-echo " sudo apt-get install torsocks tor"
-echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng 
python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip 
subversion"
+dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm 
virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 
2>/dev/null >/dev/null
+
+if [ $? -ne 0 ];
+then
+  echo "You are missing one or more Gitian build tool dependencies."
+  echo
+  echo "Please run:"
+  echo " sudo apt-get install torsocks tor"
+  echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng 
python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip 
subversion"
+  exit 1
+fi
+  else
+echo "Your Ubuntu is too old. You need Ubuntu 14.04 LTS or newer to build 
Tor Browser with Gitian."
 exit 1
   fi
 elif [ $DISTRO = "Debian" ];
diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index 27bbec0..b90356b 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -67,7 +67,7 @@ script: |
   umask 0022
   #
   mkdir -p $OUTDIR/
-  mkdir -p 
tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org
+  mkdir -p 
tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-...@eff.org
   mkdir -p 
tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions
   mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches
   mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/
@@ -101,10 +101,16 @@ script: |
   cd ../../../
   #
   cd https-everywhere
-  # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
-  # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-  rm -f .git/refs/heads/master
-  ./makexpi.sh
+  # We are invoking the build script with a particular tag to avoid #10066. 
This
+  # does not work for nightlies as there is no "master" tag in that sense. But
+  # we don't need to care about that as we don't need reproducibility for
+  # nightly builds.
+  if [ $HTTPSE_TAG != "master" ];
+  then
+./makexpi.sh $HTTPSE_TAG
+  else
+./makexpi.sh
+  fi
   # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
   rm ./pkg/*-amo.xpi
   cp pkg/*.xpi 
../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
@@ -113,7 +119,7 @@ script: |
   cp *.xpi 
tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/
   cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions
   mv noscr...@noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
-  cd https-everywh...@eff.org/
+  cd

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

2015-10-13 Thread gk

commit bf18016f9066faab660ebff8f8b1a9e49adbfb70
Merge: fed9df7 19bde77
Author: Georg Koppen 
Date:   Tue Oct 13 08:41:33 2015 +

Merge remote-tracking branch 'arthur/17220+1'

 gitian/descriptors/linux/gitian-bundle.yml |3 +++
 gitian/descriptors/mac/gitian-bundle.yml   |3 +++
 gitian/fetch-inputs.sh |4 ++--
 gitian/verify-tags.sh  |2 +-
 gitian/versions|3 +++
 gitian/versions.alpha  |3 +++
 gitian/versions.beta   |3 +++
 gitian/versions.nightly|3 +++
 8 files changed, 21 insertions(+), 3 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] Bug 17220: Bundle STIX Math font for Linux and OS X

2015-10-13 Thread gk

commit 19bde773ac5dbd3d204f17aeee15549bd562bb6f
Author: Arthur Edelstein 
Date:   Tue Oct 6 00:46:00 2015 +

Bug 17220: Bundle STIX Math font for Linux and OS X
---
 gitian/descriptors/linux/gitian-bundle.yml |3 +++
 gitian/descriptors/mac/gitian-bundle.yml   |3 +++
 gitian/fetch-inputs.sh |4 ++--
 gitian/verify-tags.sh  |2 +-
 gitian/versions|3 +++
 gitian/versions.alpha  |3 +++
 gitian/versions.beta   |3 +++
 gitian/versions.nightly|3 +++
 8 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index ce743df..27bbec0 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -54,6 +54,7 @@ files:
 - "mar-tools-linux64.zip"
 - "tbb-docs.zip"
 - "NotoSansCJKsc-Regular.otf"
+- "STIXv1.1.1-latex.zip"
 script: |
   INSTDIR="$HOME/install"
   source versions
@@ -132,6 +133,8 @@ script: |
 cp "noto-fonts/unhinted/$fontfile" tor-browser/Browser/fonts/
   done
   cp NotoSansCJKsc-Regular.otf tor-browser/Browser/fonts/
+  unzip -o STIXv1.1.1-latex.zip -d STIX
+  cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" 
tor-browser/Browser/fonts/
   #
   unzip relativelink-src.zip
   cp RelativeLink/* tor-browser/Browser/
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index e250365..a80311e 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -56,6 +56,7 @@ files:
 - "mar-tools-mac64.zip"
 - "tbb-docs.zip"
 - "mac-tor.sh"
+- "STIXv1.1.1-latex.zip"
 script: |
   INSTDIR="$HOME/install"
   source versions
@@ -133,6 +134,8 @@ script: |
   for fontfile in $NOTO_FONTS_UNHINTED; do
 cp "noto-fonts/unhinted/$fontfile" 
$TORBROWSER_NAME.app/Contents/Resources/fonts/
   done
+  unzip -o STIXv1.1.1-latex.zip -d STIX
+  cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" 
$TORBROWSER_NAME.app/Contents/Resources/fonts/
   #
   unzip tor-mac$GBUILD_BITS-gbuilt.zip
   if [ $BUILD_PT_BUNDLES ]; then
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 42efa33..881e556 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 NOTOCJKFONT
+for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT 
STIXMATHFONT
 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 NOTOCJKFONT
+for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT
 do
PACKAGE="${i}_PACKAGE"
HASH="${i}_HASH"
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index b8fc0e0..a1ce6a1 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -142,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 NOTOCJKFONT
+for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 
PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP 
PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT
 do
PACKAGE="${i}_PACKAGE"
HASH="${i}_HASH"
diff --git a/gitian/versions b/gitian/versions
index b833342..ee7f459 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -85,6 +85,7 @@ 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
+STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip
 
 # Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1
@@ -107,6 +108,7 @@ 
PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
 
NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd
+STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8
 
 ## Non-git

[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.

2015-10-13 Thread gk

commit 1c95cfa27db267c332262518c64a79c96f3ef4fa
Author: Arthur Edelstein 
Date:   Mon Oct 5 16:48:36 2015 -0700

fixup! TB4: Tor Browser's Firefox preference overrides.

Fixes bug 17220.
---
 browser/app/profile/000-tor-browser.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 3e4afd8..26b50e3 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -260,7 +260,7 @@ pref("browser.download.panel.shown", true);
 #ifdef MOZ_BUNDLED_FONTS
 
 #ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, 
Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, 
Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, 
Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans 
Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans 
Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans 
Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, 
Noto Sans Tibetan, Noto Sans Yi, STHeiti, Tahoma, Thonburi, Times, Times New 
Roman, Verdana");
+pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, 
Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, 
Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, 
Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans 
Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans 
Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans 
Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, 
Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, 
Times New Roman, Verdana");
 pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, 
Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans 
Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto 
Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans 
Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans 
Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi");
 pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto 
Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans 
Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto 
Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans 
Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans 
Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi");
 pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans 
Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, 
Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans 
Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans 
Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans 
Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans 
Tibetan, Noto Sans Yi");
@@ -273,7 +273,7 @@ pref("font.name.sans-serif.ar", "Arial");
 #endif
 
 #ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, 
Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida 
Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, 
Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans 
Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times 
New Roman, Tunga, Verdana, Vrinda");
+pref("font.system.whitelist", "Arial, Batang, Cambria Math, Courier New, 
Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, 
Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, 
Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto 
Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times 
New Roman, Tunga, Verdana, Vrinda");
 #endif
 
 #ifdef XP_LINUX



___
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 16909: Workaround for old git in 10.04

2015-10-13 Thread gk

commit c88cf009396bac20601b2de35eba2d9d98905438
Author: Georg Koppen 
Date:   Mon Oct 12 10:00:17 2015 +

Bug 16909: Workaround for old git in 10.04
---
 gitian/descriptors/linux/gitian-bundle.yml |3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index b90356b..8cd38b6 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -101,6 +101,9 @@ script: |
   cd ../../../
   #
   cd https-everywhere
+  # Workaround for git not knowing `git submodule -f` in the version shipped in
+  # 10.04.
+  sed 's/recursive -f/recursive/' -i makexpi.sh
   # We are invoking the build script with a particular tag to avoid #10066. 
This
   # does not work for nightlies as there is no "master" tag in that sense. But
   # we don't need to care about that as we don't need reproducibility for

___
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.3.0esr-5.5-2] Revert "Back out changes for bug 16909"

2015-10-13 Thread gk

commit 6b8cc11e03d53a1e31b7b3d587f8a567ce360251
Author: Georg Koppen 
Date:   Tue Oct 13 08:35:06 2015 +

Revert "Back out changes for bug 16909"

This reverts commit fc16b4e722d7a956563eb6c008f9b88f5aef8434.
---
 tools/update-packaging/make_full_update.sh|5 -
 tools/update-packaging/make_incremental_update.sh |   13 -
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/update-packaging/make_full_update.sh 
b/tools/update-packaging/make_full_update.sh
index 62baf4c..3578ae4 100755
--- a/tools/update-packaging/make_full_update.sh
+++ b/tools/update-packaging/make_full_update.sh
@@ -11,7 +11,10 @@
 . $(dirname "$0")/common.sh
 
 # TODO: it would be better to pass this as a command line option.
-directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org'
+# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
+# exists. The extension ID got changed with the version bump to 5.1.0.
+ext_path='TorBrowser/Data/Browser/profile.default/extensions'
+directories_to_remove="$ext_path/https-everywh...@eff.org 
$ext_path/https-everywhere-...@eff.org"
 
 # -
 
diff --git a/tools/update-packaging/make_incremental_update.sh 
b/tools/update-packaging/make_incremental_update.sh
index 0e1e3f6..c803809 100755
--- a/tools/update-packaging/make_incremental_update.sh
+++ b/tools/update-packaging/make_incremental_update.sh
@@ -64,7 +64,8 @@ check_for_forced_update() {
 fi
 
 # If the file in the skip list ends with /*, do a prefix match.
-# This allows 
TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org/* 
to be used to force all HTTPS Everywhere files to be updated.
+# This allows 
TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-...@eff.org/*
+# to be used to force all HTTPS Everywhere files to be updated.
 f_suffix=${f##*/}
 if [[ $f_suffix = "*" ]]; then
   f_prefix="${f%\/\*}";
@@ -122,7 +123,7 @@ archivefiles="updatev2.manifest updatev3.manifest"
 # If the NoScript or HTTPS Everywhere extensions have changed between
 # releases, add them to the "force updates" list.
 ext_path='TorBrowser/Data/Browser/profile.default/extensions'
-https_everywhere='https-everywh...@eff.org'
+https_everywhere='https-everywhere-...@eff.org'
 noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi'
 
 # NoScript is a packed extension, so we simply compare the old and the new
@@ -144,12 +145,14 @@ 
https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf"
 diff "$olddir/$https_everywhere_install_rdf" \
   "$newdir/$https_everywhere_install_rdf" > /dev/null
 rc=$?
-if [ $rc -gt 1 ]; then
+if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then
   notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command"
   exit 2
-elif [ $rc -eq 1 ]; then
+elif [ $rc -ge 1 ]; then
   requested_forced_updates="$requested_forced_updates 
$ext_path/$https_everywhere/*"
-  directories_to_remove="$directories_to_remove $ext_path/$https_everywhere"
+  # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
+  # exists. The extension ID got changed with the version bump to 5.1.0.
+  directories_to_remove="$directories_to_remove 
$ext_path/https-everywh...@eff.org $ext_path/$https_everywhere"
 fi
 
 mkdir -p "$workdir"

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

[tor-commits] [torbutton/maint-1.9.3] Revert "remove obsolete files, re Bug 1506 P0"

2015-10-13 Thread gk

commit 9f37464b6f446feec96147b32b3e2f2537f93636
Author: Yan Zhu 
Date:   Tue Jul 29 17:08:36 2014 -0700

Revert "remove obsolete files, re Bug 1506 P0"

This reverts commit 80b06cdf422238f5eece38a1974d31e6e7be7a17.
---
 src/chrome.manifest |   12 +++
 src/components/tor-protocol.js  |  103 ++
 src/components/torRefSpoofer.js |  125 +++
 src/components/tors-protocol.js |  103 ++
 src/components/window-mapper.js |  180 +++
 5 files changed, 523 insertions(+)

diff --git a/src/chrome.manifest b/src/chrome.manifest
index 8323e66..ddf582e 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -159,6 +159,18 @@ contract @torproject.org/torbutton-logger;1 
{f36d72c9-9718-4134-b550-e109638331d
 component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js
 contract @torproject.org/domain-isolator;1 
{e33fd6d4-270f-475f-a96f-ff3140279f68}
 
+# component {b985e49c-12cb-4f29-9d14-b62603332ec4} components/window-mapper.js
+# contract @torproject.org/content-window-mapper;1 
{b985e49c-12cb-4f29-9d14-b62603332ec4}
+
+# component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
+# contract @torproject.org/torRefSpoofer;1 
{65be2be0-ceb4-44c2-91a5-9c75c53430bf}
+
+# component {52183e20-4d4b-11de-8a39-0800200c9a66} components/tor-protocol.js
+# contract @mozilla.org/network/protocol;1?name=tor 
{52183e20-4d4b-11de-8a39-0800200c9a66}
+
+# component {a5a4bc50-5e8d-11de-8a39-0800200c9a66} components/tors-protocol.js
+# contract @mozilla.org/network/protocol;1?name=tors 
{a5a4bc50-5e8d-11de-8a39-0800200c9a66}
+
 category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
 category profile-after-change StartupObserver 
@torproject.org/startup-observer;1
 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
diff --git a/src/components/tor-protocol.js b/src/components/tor-protocol.js
new file mode 100644
index 000..4ba5cf4
--- /dev/null
+++ b/src/components/tor-protocol.js
@@ -0,0 +1,103 @@
+// Bug 1506 P0: This code is toggle-mode code and is unused. Kill it.
+
+// Test protocol related
+const kSCHEME = "tor";
+const kPROTOCOL_NAME = "tor";
+const kPROTOCOL_CONTRACTID = "@mozilla.org/network/protocol;1?name=" + kSCHEME;
+const kPROTOCOL_CID = Components.ID("52183e20-4d4b-11de-8a39-0800200c9a66");
+
+// Mozilla defined
+const kSIMPLEURI_CONTRACTID = "@mozilla.org/network/simple-uri;1";
+const kIOSERVICE_CONTRACTID = "@mozilla.org/network/io-service;1";
+const nsISupports = Components.interfaces.nsISupports;
+const nsIIOService = Components.interfaces.nsIIOService;
+const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
+const nsIURI = Components.interfaces.nsIURI;
+
+function Protocol()
+{
+}
+
+Protocol.prototype =
+{
+  QueryInterface: function(iid)
+  {
+if (!iid.equals(nsIProtocolHandler) &&
+!iid.equals(nsISupports))
+  throw Components.results.NS_ERROR_NO_INTERFACE;
+return this;
+  },
+
+  scheme: kSCHEME,
+  defaultPort: -1,
+  protocolFlags: nsIProtocolHandler.URI_NORELATIVE |
+ nsIProtocolHandler.URI_NOAUTH,
+  
+  allowPort: function(port, scheme)
+  {
+return false;
+  },
+
+  newURI: function(spec, charset, baseURI)
+  {
+const nsIStandardURL = Components.interfaces.nsIStandardURL;
+var uri = 
Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIStandardURL);
+uri.init(nsIStandardURL.URLTYPE_STANDARD, 80, spec, charset, baseURI);
+
+return uri.QueryInterface(Components.interfaces.nsIURI);
+
+  },
+
+  newChannel: function(aURI)
+  {
+var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+.getService(Components.interfaces.nsIPrefBranch);
+if (!prefs.getBoolPref("extensions.torbutton.tor_urls")) {
+  throw Components.results.NS_ERROR_UNKNOWN_PROTOCOL;
+}
+
+/*The protocol has been called, therefore we want to enable tor, wait for 
it to activate return the new channel with the scheme of http.*/
+var ios = 
Components.classes[kIOSERVICE_CONTRACTID].getService(nsIIOService);
+var prompt = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+.getService(Components.interfaces.nsIPromptService);
+var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled");
+var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+var chrome = wm.getMostRecentWindow("navigator:browser");
+if (!ios.allowPort(aURI.port, aURI.scheme))
+  throw Components.results.NS_ERROR_FAILURE;
+
+if (!tor_enabled)
+{
+  var result = prompt.confirm(null, "Allow Tor toggle?", "Do you want to 
enable Tor and navigate to " + aURI.spec + "?");   
+  if (!result)
+throw

[tor-commits] [torbutton/maint-1.9.3] Bug 9263: Spoof referer when leaving a .onion domain

2015-10-13 Thread gk

commit d5234a3e37fb717d5c2f65ef039cd7872cbd1de3
Author: Yan Zhu 
Date:   Tue Jul 29 17:36:27 2014 -0700

Bug 9263: Spoof referer when leaving a .onion domain
---
 makexpi.sh  |2 +-
 src/chrome.manifest |   15 +--
 src/components/tor-protocol.js  |  103 --
 src/components/torRefSpoofer.js |  103 ++
 src/components/tors-protocol.js |  103 --
 src/components/window-mapper.js |  180 ---
 src/defaults/preferences/preferences.js |1 -
 7 files changed, 39 insertions(+), 468 deletions(-)

diff --git a/makexpi.sh b/makexpi.sh
index 4d01e2c..243fbd6 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -21,7 +21,7 @@ echo -- create $APP_NAME.xpi --
 mkdir -p pkg
 cd src
 echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*"
-zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x 
"components/torRefSpoofer.js" #-x "chrome/*"
+zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*"
 #mv ../$APP_NAME.jar ./chrome
 #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar
 cd ..
diff --git a/src/chrome.manifest b/src/chrome.manifest
index ddf582e..1d3efb4 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -159,18 +159,11 @@ contract @torproject.org/torbutton-logger;1 
{f36d72c9-9718-4134-b550-e109638331d
 component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js
 contract @torproject.org/domain-isolator;1 
{e33fd6d4-270f-475f-a96f-ff3140279f68}
 
-# component {b985e49c-12cb-4f29-9d14-b62603332ec4} components/window-mapper.js
-# contract @torproject.org/content-window-mapper;1 
{b985e49c-12cb-4f29-9d14-b62603332ec4}
-
-# component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
-# contract @torproject.org/torRefSpoofer;1 
{65be2be0-ceb4-44c2-91a5-9c75c53430bf}
-
-# component {52183e20-4d4b-11de-8a39-0800200c9a66} components/tor-protocol.js
-# contract @mozilla.org/network/protocol;1?name=tor 
{52183e20-4d4b-11de-8a39-0800200c9a66}
+category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
 
-# component {a5a4bc50-5e8d-11de-8a39-0800200c9a66} components/tors-protocol.js
-# contract @mozilla.org/network/protocol;1?name=tors 
{a5a4bc50-5e8d-11de-8a39-0800200c9a66}
+component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
+contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf}
 
-category profile-after-change CookieJarSelector 
@torproject.org/cookie-jar-selector;1
+category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1
 category profile-after-change StartupObserver 
@torproject.org/startup-observer;1
 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
diff --git a/src/components/tor-protocol.js b/src/components/tor-protocol.js
deleted file mode 100644
index 4ba5cf4..000
--- a/src/components/tor-protocol.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Bug 1506 P0: This code is toggle-mode code and is unused. Kill it.
-
-// Test protocol related
-const kSCHEME = "tor";
-const kPROTOCOL_NAME = "tor";
-const kPROTOCOL_CONTRACTID = "@mozilla.org/network/protocol;1?name=" + kSCHEME;
-const kPROTOCOL_CID = Components.ID("52183e20-4d4b-11de-8a39-0800200c9a66");
-
-// Mozilla defined
-const kSIMPLEURI_CONTRACTID = "@mozilla.org/network/simple-uri;1";
-const kIOSERVICE_CONTRACTID = "@mozilla.org/network/io-service;1";
-const nsISupports = Components.interfaces.nsISupports;
-const nsIIOService = Components.interfaces.nsIIOService;
-const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
-const nsIURI = Components.interfaces.nsIURI;
-
-function Protocol()
-{
-}
-
-Protocol.prototype =
-{
-  QueryInterface: function(iid)
-  {
-if (!iid.equals(nsIProtocolHandler) &&
-!iid.equals(nsISupports))
-  throw Components.results.NS_ERROR_NO_INTERFACE;
-return this;
-  },
-
-  scheme: kSCHEME,
-  defaultPort: -1,
-  protocolFlags: nsIProtocolHandler.URI_NORELATIVE |
- nsIProtocolHandler.URI_NOAUTH,
-  
-  allowPort: function(port, scheme)
-  {
-return false;
-  },
-
-  newURI: function(spec, charset, baseURI)
-  {
-const nsIStandardURL = Components.interfaces.nsIStandardURL;
-var uri = 
Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIStandardURL);
-uri.init(nsIStandardURL.URLTYPE_STANDARD, 80, spec, charset, baseURI);
-
-return uri.QueryInterface(Components.interfaces.nsIURI);
-
-  },
-
-  newChannel: function(aURI)
-  {
-var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-.getService(Components.interfaces.nsIPrefBranch);
-if (!prefs.getBoolPref("extensions.torbutton.tor_urls")) {
-  throw Components.results.NS_ERROR_UNKNOWN_PROTOCOL;
-}
-
-/*The protocol has been called, therefore we want to enable tor, wait for 
it to activate

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2015-10-13 Thread translation

commit a77050c86571c7d34316ec746a206fbce51b386e
Author: Translation commit bot 
Date:   Tue Oct 13 13:45:37 2015 +

Update translations for tails-misc
---
 fr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr.po b/fr.po
index 487bd56..a54f836 100644
--- a/fr.po
+++ b/fr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-20 19:32+0200\n"
-"PO-Revision-Date: 2015-09-21 09:20+\n"
+"PO-Revision-Date: 2015-10-13 13:23+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"

___
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-10-13 Thread translation

commit d3145b9c2ea4e33d1af142c50c4ce3268b119974
Author: Translation commit bot 
Date:   Tue Oct 13 14:46:22 2015 +

Update translations for tor-messenger-ircproperties
---
 el/irc.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/el/irc.properties b/el/irc.properties
index b68e916..84596c1 100644
--- a/el/irc.properties
+++ b/el/irc.properties
@@ -120,7 +120,7 @@ message.alreadyInChannel=%1$S is already in %2$S.
 #%S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
 #%S is the nickname of the user whose WHOIS information follows this 
message.
-message.whois=WHOIS information for %S:
+message.whois=Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ WHOIS Î³Î¹Î± %S:
 #%1$S is the nickname of the (offline) user whose WHOWAS information 
follows this message.
 message.whowas=%1$S is offline. WHOWAS information for %1$S:
 #%1$S is the entry description (from tooltip.*), %2$S is its value.
@@ -155,7 +155,7 @@ error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=You cannot change modes for other users.
 #%S is the nickname or channel name that isn't available.
-error.noSuchNick=%S is not online.
+error.noSuchNick=Î %S Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏÏÎ½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿Ï.
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=There is no channel: %S.
 error.unavailable=%S is temporarily unavailable.
@@ -190,7 +190,7 @@ tooltip.secure=Using a secure connection
 tooltip.away=ÎÎ±ÎºÏÎ¹Î¬
 tooltip.ircOp=IRC Operator
 tooltip.bot=Bot
-tooltip.lastActivity=Last activity
+tooltip.lastActivity=Î¤ÎµÎ»ÎµÏÏÎ±Î¯Î± Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±
 # %S is the timespan elapsed since the last activity.
 tooltip.timespan=%S ago
 tooltip.channels=Currently on

___
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-10-13 Thread translation

commit 4da95713438efb54f1ff6ac0d9d079e5d59973b1
Author: Translation commit bot 
Date:   Tue Oct 13 15:45:04 2015 +

Update translations for bridgedb
---
 nb/LC_MESSAGES/bridgedb.po |  344 ++--
 sr/LC_MESSAGES/bridgedb.po |  338 +--
 2 files changed, 343 insertions(+), 339 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 0e00bac..2e61082 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -4,23 +4,25 @@
 # 
 # Translators:
 # Allan NordhÃ¸y , 2014
-# Erik Matson , 2015
+# Erik Matson, 2015
 # Harald , 2014
 # Kristian Andre Henriksen , 2015
 # lateralus, 2013
+# PÃ¥l Fiksdal , 2015
 # Per Thorsheim , 2015
 # thor574 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-06-23 12:17+\n"
-"Last-Translator: Erik Matson \n"
-"Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2015-10-13 15:27+\n"
+"Last-Translator: PÃ¥l Fiksdal \n"
+"Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\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"
+"Generated-By: Babel 1.3\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -35,57 +37,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Dette var leit! Noe gikk galt med forespÃ¸rselen din."
+msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapporter en feil"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Endringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Velg alle"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QR kode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kode for dine brolinjer"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oisann!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det oppsto en feil ved innhenting av din QR kode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser 
for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Det er for tiden ingen tilgjengelige broer..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen 
brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Last ned %s Tor-nettleser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hent %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "NÃ¥ %s legg til broer

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

2015-10-13 Thread translation

commit 20c612e746fe0c873fd69d83d16bfd4b490c36af
Author: Translation commit bot 
Date:   Tue Oct 13 15:45:08 2015 +

Update translations for bridgedb_completed
---
 nb/LC_MESSAGES/bridgedb.po |  344 ++--
 sr/LC_MESSAGES/bridgedb.po |  338 +--
 2 files changed, 343 insertions(+), 339 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 0e00bac..2e61082 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -4,23 +4,25 @@
 # 
 # Translators:
 # Allan NordhÃ¸y , 2014
-# Erik Matson , 2015
+# Erik Matson, 2015
 # Harald , 2014
 # Kristian Andre Henriksen , 2015
 # lateralus, 2013
+# PÃ¥l Fiksdal , 2015
 # Per Thorsheim , 2015
 # thor574 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-06-23 12:17+\n"
-"Last-Translator: Erik Matson \n"
-"Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2015-10-13 15:27+\n"
+"Last-Translator: PÃ¥l Fiksdal \n"
+"Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\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"
+"Generated-By: Babel 1.3\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -35,57 +37,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Dette var leit! Noe gikk galt med forespÃ¸rselen din."
+msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapporter en feil"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Endringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Velg alle"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QR kode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kode for dine brolinjer"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oisann!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det oppsto en feil ved innhenting av din QR kode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser 
for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Det er for tiden ingen tilgjengelige broer..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen 
brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Last ned %s Tor-nettleser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hent %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "NÃ¥ %s legg

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2015-10-13 Thread translation

commit 945246696df1dcb50c6b6ade1cb89fcb78060d19
Author: Translation commit bot 
Date:   Tue Oct 13 15:45:47 2015 +

Update translations for tails-misc_completed
---
 fr.po |   29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/fr.po b/fr.po
index 32044c5..8321294 100644
--- a/fr.po
+++ b/fr.po
@@ -10,6 +10,7 @@
 # Athorcis, 2015
 # Emmanuel Simond, 2014
 # Jean-Yves Toumit , 2013
+# Lidija , 2015
 # Onizuka, 2013
 # mosira , 2014
 # Sabrina Cater , 2015
@@ -19,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-10 18:53+0200\n"
-"PO-Revision-Date: 2015-08-20 15:48+\n"
-"Last-Translator: Sabrina Cater \n"
+"POT-Creation-Date: 2015-09-20 19:32+0200\n"
+"PO-Revision-Date: 2015-10-13 15:33+\n"
+"Last-Translator: Lidija \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -189,7 +190,7 @@ msgstr "Faites-vous confiance Ã  ces clÃ©s ?"
 msgid "The following selected key is not fully trusted:"
 msgid_plural "The following selected keys are not fully trusted:"
 msgstr[0] "La clÃ© suivante n'est pas totalement de confiance :"
-msgstr[1] "Les clÃ©s suivantes ne sont pas totalement de confiance :"
+msgstr[1] "Les clÃ©s suivantes ne sont pas totalement fiables :"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:578
 msgid "Do you trust this key enough to use it anyway?"
@@ -317,23 +318,23 @@ msgstr "Il semble que votre connexion au rÃ©seau est 
bloquÃ©e. Cela peut Ãªtre l
 msgid "This version of Tails has known security issues:"
 msgstr "Cette version de Tails a des problÃ¨mes de sÃ©curitÃ© avÃ©rÃ©s :"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37
+#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "Carte rÃ©seau ${nic} dÃ©sactivÃ©e"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38
+#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing. See the documentation."
 msgstr "L'usurpation MAC a Ã©chouÃ© pour la carte rÃ©seau ${nic_name} 
(${nic}), cette fonctionnalitÃ© est donc temporairement dÃ©sactivÃ©e.\nVous 
pouvez nÃ©anmoins redÃ©marrer Tails et dÃ©sactiver complÃ¨tement la 
fonctionnalitÃ© d'usurpation MAC. Consultez la documentation."
 
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47
+#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55
 msgid "All networking disabled"
 msgstr "Toutes les connexions rÃ©seau sont dÃ©sactivÃ©es"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48
+#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery 
also failed so all networking is disabled.\n"
@@ -479,8 +480,8 @@ msgid "I2P's router console is ready"
 msgstr "La console du routeur I2P est prÃªte"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44
-msgid "You can now access I2P's router console on http://127.0.0.1:7657.;
-msgstr "Vous pouvez maintenant accÃ©der Ã  la console du routeur I2P sur 
http://127.0.0.1:7657.;
+msgid "You can now access I2P's router console in the I2P Browser."
+msgstr "Vous pouvez maintenant accÃ©der Ã  la console du routeur dans le 
navigateur I2P."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49
 msgid "I2P is not ready"
@@ -488,10 +489,10 @@ msgstr "I2P n'est pas prÃªt"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50
 msgid ""
-"Eepsite tunnel not built within six minutes. Check the router console at "
-"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information."
-" Reconnect to the network to try again."
-msgstr "Le tunnel de l'Eepsite n'a pas Ã©tÃ© construit durant les six 
derniÃ¨res minutes. Pour plus d'information vÃ©rifiez la console de routeur 
dans http://127.0.0.1:7657/logs ou les historiques dans /var/log/i2p . 
Reconnectez-vous au rÃ©seau afin de rÃ©essayer."
+"Eepsite tunnel not built within six minutes. Check the router console in the"
+" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to "
+"the network to try again."
+msgstr "Le tunnel Eepsite n'a pas Ã©tÃ© construit en six minutes.\nVÃ©rifier 
la console du routeur dans le navigateur I2P ou dans les journaux Ã  
/var/log/I2p pour plus d'informations.\nReconnectez-vous au rÃ©seau Ã  nouveau."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60
 msgid "I2P is ready"

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2015-10-13 Thread translation

commit 8585634d71ac1e14dc73c5a7f6268a6691ec
Author: Translation commit bot 
Date:   Tue Oct 13 15:45:44 2015 +

Update translations for tails-misc
---
 fr.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fr.po b/fr.po
index a54f836..8321294 100644
--- a/fr.po
+++ b/fr.po
@@ -10,6 +10,7 @@
 # Athorcis, 2015
 # Emmanuel Simond, 2014
 # Jean-Yves Toumit , 2013
+# Lidija , 2015
 # Onizuka, 2013
 # mosira , 2014
 # Sabrina Cater , 2015
@@ -20,8 +21,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-20 19:32+0200\n"
-"PO-Revision-Date: 2015-10-13 13:23+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2015-10-13 15:33+\n"
+"Last-Translator: Lidija \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -189,7 +190,7 @@ msgstr "Faites-vous confiance Ã  ces clÃ©s ?"
 msgid "The following selected key is not fully trusted:"
 msgid_plural "The following selected keys are not fully trusted:"
 msgstr[0] "La clÃ© suivante n'est pas totalement de confiance :"
-msgstr[1] "Les clÃ©s suivantes ne sont pas totalement de confiance :"
+msgstr[1] "Les clÃ©s suivantes ne sont pas totalement fiables :"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:578
 msgid "Do you trust this key enough to use it anyway?"
@@ -480,7 +481,7 @@ msgstr "La console du routeur I2P est prÃªte"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44
 msgid "You can now access I2P's router console in the I2P Browser."
-msgstr ""
+msgstr "Vous pouvez maintenant accÃ©der Ã  la console du routeur dans le 
navigateur I2P."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49
 msgid "I2P is not ready"
@@ -491,7 +492,7 @@ msgid ""
 "Eepsite tunnel not built within six minutes. Check the router console in the"
 " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to "
 "the network to try again."
-msgstr ""
+msgstr "Le tunnel Eepsite n'a pas Ã©tÃ© construit en six minutes.\nVÃ©rifier 
la console du routeur dans le navigateur I2P ou dans les journaux Ã  
/var/log/I2p pour plus d'informations.\nReconnectez-vous au rÃ©seau Ã  nouveau."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60
 msgid "I2P is ready"

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

[tor-commits] [tor-messenger-build/master] Rebrand Tor Messenger as Unnamed Messenger

2015-10-13 Thread sukhbir

commit 69c73e53b4f03fbf90eaaea14b0d9ec04420ca20
Author: Sukhbir Singh 
Date:   Tue Oct 13 12:08:12 2015 -0400

Rebrand Tor Messenger as Unnamed Messenger
---
 projects/instantbird/branding/about.png|  Bin 9880 -> 10728 bytes
 projects/instantbird/branding/name.patch   |   16 +-
 projects/instantbird/branding/osx.patch|2 +-
 projects/tor-messenger/build   |   16 +-
 projects/tor-messenger/build.osx   |   14 +-
 projects/tor-messenger/config  |   10 +-
 projects/tor-messenger/start-tor-messenger |  372 
 projects/tor-messenger/start-tor-messenger.desktop |   29 +-
 projects/tor-messenger/start-unnamed-messenger |  372 
 projects/tor-messenger/tor-messenger.ico   |  Bin 23934 -> 0 bytes
 projects/tor-messenger/tor-messenger.nsi   |  168 -
 projects/tor-messenger/unnamed-messenger.ico   |  Bin 0 -> 23934 bytes
 projects/tor-messenger/unnamed-messenger.nsi   |  168 +
 13 files changed, 584 insertions(+), 583 deletions(-)

diff --git a/projects/instantbird/branding/about.png 
b/projects/instantbird/branding/about.png
index 5d7f579..8dbd586 100644
Binary files a/projects/instantbird/branding/about.png and 
b/projects/instantbird/branding/about.png differ
diff --git a/projects/instantbird/branding/name.patch 
b/projects/instantbird/branding/name.patch
index 378c6db..a8b7f29 100644
--- a/projects/instantbird/branding/name.patch
+++ b/projects/instantbird/branding/name.patch
@@ -10,8 +10,8 @@ index e5b5348..276722b 100755
 -!define CompanyName   "Instantbird"
 -!define URLInfoAbout  "http://www.instantbird.com/;
 -!define URLUpdateInfo "http://www.instantbird.com/;
-+!define BrandFullNameInternal "Tor Messenger"
-+!define CompanyName   "Tor Messenger"
++!define BrandFullNameInternal "Unnamed Messenger"
++!define CompanyName   "Unnamed Messenger"
 +!define URLInfoAbout  "https://www.torproject.org;
 +!define URLUpdateInfo "https://www.torproject.org;
  
@@ -25,11 +25,11 @@ index c569ebb..2d6a5d8 100644
  
 -
 -
-+
-+
++
++
  
 -
-+
++
 diff --git a/im/branding/messenger/locales/en-US/brand.properties 
b/im/branding/messenger/locales/en-US/brand.properties
 index f949ced..93528a3 100644
 --- a/im/branding/messenger/locales/en-US/brand.properties
@@ -41,6 +41,6 @@ index f949ced..93528a3 100644
 -brandShortName=Instantbird
 -brandFullName=Instantbird - Nightly
 -vendorShortName=Instantbird
-+brandShortName=Tor Messenger
-+brandFullName=Tor Messenger - Alpha
-+vendorShortName=Tor Messenger
++brandShortName=Unnamed Messenger
++brandFullName=Unnamed Messenger - Beta
++vendorShortName=Unnamed Messenger
diff --git a/projects/instantbird/branding/osx.patch 
b/projects/instantbird/branding/osx.patch
index 196d671..a64e751 100644
--- a/projects/instantbird/branding/osx.patch
+++ b/projects/instantbird/branding/osx.patch
@@ -6,4 +6,4 @@ diff --git a/im/branding/messenger/configure.sh 
b/im/branding/messenger/configur
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 -MOZ_APP_DISPLAYNAME=Instantbird
-+MOZ_APP_DISPLAYNAME="Tor Messenger"
++MOZ_APP_DISPLAYNAME="Unnamed Messenger"
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index f51bf1f..d3d4c9b 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -20,11 +20,11 @@ tar xf [% c('input_files_by_name/bundle-data') %] -C 
bundle/Messenger/TorMesseng
 
 [% IF c("var/linux") %]
 tar xf [% c('input_files_by_name/gcc') %]
-chmod 755 start-tor-messenger start-tor-messenger.desktop execdesktop
+chmod 755 start-unnamed-messenger start-unnamed-messenger.desktop execdesktop
 
-cp start-tor-messenger.desktop bundle/
-mv start-tor-messenger.desktop bundle/Messenger/
-mv start-tor-messenger bundle/Messenger/
+cp start-unnamed-messenger.desktop bundle/
+mv start-unnamed-messenger.desktop bundle/Messenger/
+mv start-unnamed-messenger bundle/Messenger/
 mv execdesktop bundle/Messenger/
 
 mkdir -p bundle/Messenger/lib
@@ -52,13 +52,13 @@ mv tor-browser_en-US/Browser/TorBrowser/Tor 
tor-launc...@torproject.org/TorBrows
 mv tor-browser_en-US/Browser/TorBrowser/Data/Tor 
tor-launc...@torproject.org/TorBrowser/Data/Tor
 rm -Rf tor-browser_en-US
 cd ../../../
-mv bundle tor-messenger
+mv bundle unnamed-messenger
 [% IF c('var/windows') -%]
-makensis tor-messenger.nsi
-mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') %]
+makensis unnamed-messenger.nsi
+mv unnamed-messenger-install.exe [% dest_dir _ '/' _ c('filename') %]
 [% ELSE -%]
 [% c('tar', {
-tar_src => [ 'tor-messenger' ],
+tar_src => [ 'unnamed-messenger' ],
 tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'),
 }) %]
 [% END -%]
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 16e9b47..f751a42 100644
---

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

2015-10-13 Thread translation

commit 76b2d40944d6483316003d5586329a5587bfb25d
Author: Translation commit bot 
Date:   Tue Oct 13 16:15:07 2015 +

Update translations for bridgedb_completed
---
 sr/LC_MESSAGES/bridgedb.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index f1b0c85..917c343 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2015-10-13 15:42+\n"
+"PO-Revision-Date: 2015-10-13 15:54+\n"
 "Last-Translator: Lidija \n"
 "Language-Team: Serbian 
(http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -291,11 +291,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 "Unesite Å¡to viÅ¡e informacija o vaÅ¡em sluÄaju, ukljuÄujuÄi: 
spisak\nmostova i prikljuÄivih transporta koje ste pokuÅ¡ali da koristite, 
verziju\nvaÅ¡eg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd."
+msgstr "Ð£Ð½ÐµÑÐ¸ÑÐµ ÑÑÐ¾ Ð²Ð¸ÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ° Ð¾ Ð²Ð°ÑÐµÐ¼ 
ÑÐ»ÑÑÐ°ÑÑ, ÑÐºÑÑÑÑÑÑÑÐ¸ ÑÐ¿Ð¸ÑÐ°Ðº\nÐ¼Ð¾ÑÑÐ¾Ð²Ð° Ð¸ 
Ð¿ÑÐ¸ÐºÑÑÐ¸Ð²Ð¸Ñ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ° ÐºÐ¾ÑÐµ ÑÑÐµ Ð¿Ð¾ÐºÑÑÐ°Ð»Ð¸ Ð´Ð° 
ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ, \nÐ²ÐµÑÐ·Ð¸ÑÑ Ð²Ð°ÑÐµÐ³ ÑÐ¾Ñ 
Ð¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°ÑÐ°, Ð±Ð¸Ð»Ð¾ \nÐºÐ¾ÑÑ Ð¿Ð¾ÑÑÐºÑ ÐºÐ¾ÑÑ Ð²Ð°Ð¼ ÑÐµ 
Ð¢Ð¾Ñ Ð¸Ð·Ð±Ð°ÑÐ¸Ð¾, Ð¸ÑÐ´."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Evo vaÅ¡ih premoÅ¡ÄivaÄa:"
+msgstr "ÐÐ²Ð¾ ÐÐ°ÑÐ¸Ñ Ð»Ð¸Ð½Ð¸ÑÐ° Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°:"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
@@ -333,14 +333,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 "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor 
Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i 
\nstartovanje Tor Brauzera."
+msgstr "ÐÐ° Ð±Ð¸ÑÑÐµ ÑÐ½ÐµÐ»Ð¸ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ 
Ð¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°Ñ Tor, Ð¿ÑÐ²Ð¸ Ð¸Ð´Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸ %s Ð·Ð° 
Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ %s \nÐ¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¸ ÑÐ°Ð¼Ð¾ 
Ð¿ÑÐ°ÑÐ¸ÑÐµ ÑÐ¿ÑÑÑÑÐ²Ð° Ð·Ð° Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ Ð¸ Ð¿Ð¾ÐºÑÐµÑÐ°ÑÐµ 
Ð¿ÑÐµÑÑÐ°ÑÐ¸Ð²Ð°ÑÐ° Ð¢Ð¾Ñ."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n"
 "the wizard until it asks:"
-msgstr "ÐÐ°Ð´Ð° ÑÐµ 'ÐÐ¾Ð´ÐµÑÐ°Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¼ÑÐµÐ¶Ðµ' Ð´Ð¸ÑÐ°Ð»Ð¾Ð³ 
Ð¿Ð¾ÑÐ°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ 'ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¸' Ð¸ Ð¿ÑÐ°ÑÐ¸ÑÐµ 
ÑÐ¿ÑÑÑÑÐ²Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ð¸ÑÐ°ÑÑ:"
+msgstr "ÐÐ°Ð´Ð° ÑÐµ Ð´Ð¸ÑÐ°Ð»Ð¾Ð³ 'ÐÐ¾Ð´ÐµÑÐ°Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¼ÑÐµÐ¶Ðµ' 
Ð¿Ð¾ÑÐ°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ 'ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¸' Ð¸ Ð¿ÑÐ°ÑÐ¸ÑÐµ 
ÑÐ¿ÑÑÑÑÐ²Ð° Ð´Ð¾ Ð¿Ð¸ÑÐ°ÑÐ°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:155

___
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-10-13 Thread translation

commit 30f50bda3d289630c04632899df8ad3637123ae2
Author: Translation commit bot 
Date:   Tue Oct 13 16:15:03 2015 +

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

diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index f1b0c85..917c343 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2015-10-13 15:42+\n"
+"PO-Revision-Date: 2015-10-13 15:54+\n"
 "Last-Translator: Lidija \n"
 "Language-Team: Serbian 
(http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -291,11 +291,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 "Unesite Å¡to viÅ¡e informacija o vaÅ¡em sluÄaju, ukljuÄujuÄi: 
spisak\nmostova i prikljuÄivih transporta koje ste pokuÅ¡ali da koristite, 
verziju\nvaÅ¡eg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd."
+msgstr "Ð£Ð½ÐµÑÐ¸ÑÐµ ÑÑÐ¾ Ð²Ð¸ÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ° Ð¾ Ð²Ð°ÑÐµÐ¼ 
ÑÐ»ÑÑÐ°ÑÑ, ÑÐºÑÑÑÑÑÑÑÐ¸ ÑÐ¿Ð¸ÑÐ°Ðº\nÐ¼Ð¾ÑÑÐ¾Ð²Ð° Ð¸ 
Ð¿ÑÐ¸ÐºÑÑÐ¸Ð²Ð¸Ñ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ° ÐºÐ¾ÑÐµ ÑÑÐµ Ð¿Ð¾ÐºÑÑÐ°Ð»Ð¸ Ð´Ð° 
ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ, \nÐ²ÐµÑÐ·Ð¸ÑÑ Ð²Ð°ÑÐµÐ³ ÑÐ¾Ñ 
Ð¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°ÑÐ°, Ð±Ð¸Ð»Ð¾ \nÐºÐ¾ÑÑ Ð¿Ð¾ÑÑÐºÑ ÐºÐ¾ÑÑ Ð²Ð°Ð¼ ÑÐµ 
Ð¢Ð¾Ñ Ð¸Ð·Ð±Ð°ÑÐ¸Ð¾, Ð¸ÑÐ´."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Evo vaÅ¡ih premoÅ¡ÄivaÄa:"
+msgstr "ÐÐ²Ð¾ ÐÐ°ÑÐ¸Ñ Ð»Ð¸Ð½Ð¸ÑÐ° Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°:"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
@@ -333,14 +333,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 "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor 
Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i 
\nstartovanje Tor Brauzera."
+msgstr "ÐÐ° Ð±Ð¸ÑÑÐµ ÑÐ½ÐµÐ»Ð¸ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ 
Ð¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°Ñ Tor, Ð¿ÑÐ²Ð¸ Ð¸Ð´Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸ %s Ð·Ð° 
Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ %s \nÐ¿ÑÐµÑÑÐ°Ð¶Ð¸Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¸ ÑÐ°Ð¼Ð¾ 
Ð¿ÑÐ°ÑÐ¸ÑÐµ ÑÐ¿ÑÑÑÑÐ²Ð° Ð·Ð° Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ Ð¸ Ð¿Ð¾ÐºÑÐµÑÐ°ÑÐµ 
Ð¿ÑÐµÑÑÐ°ÑÐ¸Ð²Ð°ÑÐ° Ð¢Ð¾Ñ."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n"
 "the wizard until it asks:"
-msgstr "ÐÐ°Ð´Ð° ÑÐµ 'ÐÐ¾Ð´ÐµÑÐ°Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¼ÑÐµÐ¶Ðµ' Ð´Ð¸ÑÐ°Ð»Ð¾Ð³ 
Ð¿Ð¾ÑÐ°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ 'ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¸' Ð¸ Ð¿ÑÐ°ÑÐ¸ÑÐµ 
ÑÐ¿ÑÑÑÑÐ²Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ð¸ÑÐ°ÑÑ:"
+msgstr "ÐÐ°Ð´Ð° ÑÐµ Ð´Ð¸ÑÐ°Ð»Ð¾Ð³ 'ÐÐ¾Ð´ÐµÑÐ°Ð²Ð°ÑÐ° Ð¢Ð¾Ñ Ð¼ÑÐµÐ¶Ðµ' 
Ð¿Ð¾ÑÐ°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ 'ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¸' Ð¸ Ð¿ÑÐ°ÑÐ¸ÑÐµ 
ÑÐ¿ÑÑÑÑÐ²Ð° Ð´Ð¾ Ð¿Ð¸ÑÐ°ÑÐ°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:155

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

[tor-commits] [tor-messenger-build/master] Update directory path for ctypes-otr

2015-10-13 Thread sukhbir

commit 2d4cdd4681d5b07f08360d13198663eb17f6f0ca
Author: Sukhbir Singh 
Date:   Tue Oct 13 13:41:07 2015 -0400

Update directory path for ctypes-otr
---
 projects/tor-messenger/build.osx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index f751a42..1b02d75 100644
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -24,7 +24,7 @@ cd ..
 mkdir ctypes-otr
 cd ctypes-otr
 tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %]
-mv ctypes-otr* $rootdir/Tor\ 
Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger
+mv ctypes-otr* $rootdir/Unnamed\ 
Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger
 cd ..
 
 mkdir Unnamed\ Messenger.app/TorMessenger

___
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-10-13 Thread translation

commit 42b06441930ae13ca8eb8327b4ec7057addc4988
Author: Translation commit bot 
Date:   Tue Oct 13 16:45:06 2015 +

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

diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 917c343..aab19aa 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2015-10-13 15:54+\n"
+"PO-Revision-Date: 2015-10-13 16:39+\n"
 "Last-Translator: Lidija \n"
 "Language-Team: Serbian 
(http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ! ÐÐµÑÑÐ¾ ÑÐµ Ð»Ð¾ÑÐµ Ð´ÐµÑÐ¸Ð»Ð¾ ÑÐ° 
Ð²Ð°ÑÐ¸Ð¼ Ð·Ð°ÑÑÐµÐ²Ð¾Ð¼."
+msgstr "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ! ÐÐ¾Ð³Ð¾Ð´Ð¸Ð»Ð° ÑÐµ Ð³ÑÐµÑÐºÐ° ÑÐ° Ð²Ð°ÑÐ¸Ð¼ 
Ð·Ð°ÑÑÐµÐ²Ð¾Ð¼."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -48,7 +48,7 @@ msgstr "ÐÐ·Ð²Ð¾ÑÐ½Ð¸ ÐºÐ¾Ð´"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Promena loga"
+msgstr "ÐÑÐ¾Ð¼ÐµÐ½Ð° Ð»Ð¾Ð³Ð°"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
@@ -64,7 +64,7 @@ msgstr "ÐÑÐ¸ÐºÐ°Ð¶Ð¸ QRCode"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ"
+msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -83,7 +83,7 @@ msgstr "ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ 
Ð½Ð°Ð±Ð°Ð²Ð»ÑÐ°ÑÑ Ð²Ð°ÑÐµÐ³
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "QR ÐºÐ¾Ð´ ÑÐ°Ð´ÑÐ¶Ð¸ Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ. 
Ð¡ÐºÐµÐ½Ð¸ÑÐ°ÑÐµÑ Ð³Ð° ÑÐ° ÑÐ¸ÑÐ°ÑÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸ÑÑÐµ 
Ð¸ÑÐºÐ¾Ð¿Ð¸ÑÐ°Ð»Ð¸ Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ 
ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´ÑÑÐ³Ðµ ÑÑÐµÑÐ°ÑÐµ."
+msgstr "QR ÐºÐ¾Ð´ ÑÐ°Ð´ÑÐ¶Ð¸ Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°. 
Ð¡ÐºÐµÐ½Ð¸ÑÐ°ÑÐµÑ Ð³Ð° ÑÐ° ÑÐ¸ÑÐ°ÑÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸ÑÑÐµ 
Ð¸ÑÐºÐ¾Ð¿Ð¸ÑÐ°Ð»Ð¸ Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ° Ð½Ð° 
Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´ÑÑÐ³Ðµ ÑÑÐµÑÐ°ÑÐµ."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
@@ -104,7 +104,7 @@ msgstr "ÐÐ¾ÑÐ°Ðº %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "ÐÑÐµÑÐ·Ð¼Ð¸ÑÐµ %s Ð¢Ð¾Ñ Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ %s"
+msgstr "ÐÑÐµÑÐ·Ð¼Ð¸ÑÐµ %s Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ Ð¢Ð¾Ñ %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -124,7 +124,7 @@ msgstr "ÐÐ¾ÑÐ°Ðº %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°ÑÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ Ð¢Ð¾Ñ 
Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ %s"
+msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°ÑÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ 
Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ Ð¢Ð¾Ñ%s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -191,7 +191,7 @@ msgstr "ÐÐ¾Ð±ÑÐ¾Ð´Ð¾ÑÐ»Ð¸ Ñ BridgeDB!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð½Ð¸ transport TYPEs:"
+msgstr "Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð½Ð¸ Ð¢ÐÐ Ð¿ÑÐµÐ½Ð¾ÑÐ°:"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -228,7 +228,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸ÑÐ¸ Ð¼Ð¾ÑÑÐ¾Ð²Ðµ ÑÐ° Ð²Ð¸ÑÐµ %s 
ÑÐ¸Ð¿Ð¾Ð²Ð° Pluggable Transports %s,\nÑÑÐ¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ 
Ð¿ÑÐ¸ÐºÑÐ¸Ð²Ð°ÑÑ Ð²Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÐµÐºÑÐ¸ÑÐ° ÑÐ° Ð¢Ð¾Ñ ÐÑÐµÐ¶Ð¾Ð¼ 
Ð´Ð° Ð±Ð¸ Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ð¼Ðµ ÐºÐ¾\nÐ¿Ð¾ÑÐ¼Ð°ÑÑÐ° Ð²Ð°Ñ Ð¸Ð½ÑÐµÐ½ÐµÑ 
ÑÐ°Ð¾Ð±ÑÐ°ÑÐ°Ñ Ð±Ð¸Ð»Ð¾ ÑÐµÐ¶Ðµ Ð´Ð° ÑÑÐ²ÑÐ´Ð¸ Ð´Ð° ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ 
Ð¢Ð¾Ñ.\n\n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸ÑÐ¸ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ ÑÐ° 
Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ %s ÑÐ¸Ð¿Ð¾Ð²Ð° Ð¿ÑÐ¸ÐºÑÑÑÐ½Ð¸Ñ Ð¿ÑÐµÐ½Ð¾ÑÐ° 
%s,\nÑÑÐ¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ Ð¿ÑÐ¸ÐºÑÐ¸Ð²Ð°ÑÑ Ð²Ð°ÑÐ¸Ñ 
ÐºÐ¾Ð½ÐµÐºÑÐ¸ÑÐ° ÑÐ° ÐÑÐµÐ¶Ð¾Ð¼ Ð¢Ð¾Ñ, ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð±Ð¸Ð»Ð¾\nÐºÐ¾Ð¼Ðµ 
ÐºÐ¾ Ð¿Ð¾ÑÐ¼Ð°ÑÑÐ° Ð²Ð°Ñ Ð¸Ð½ÑÐµÐ½ÐµÑ

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

2015-10-13 Thread translation

commit 3ffd15f3bbf92e780f48778c048211e8054d8cc3
Author: Translation commit bot 
Date:   Tue Oct 13 16:45:03 2015 +

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

diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 917c343..aab19aa 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2015-10-13 15:54+\n"
+"PO-Revision-Date: 2015-10-13 16:39+\n"
 "Last-Translator: Lidija \n"
 "Language-Team: Serbian 
(http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ! ÐÐµÑÑÐ¾ ÑÐµ Ð»Ð¾ÑÐµ Ð´ÐµÑÐ¸Ð»Ð¾ ÑÐ° 
Ð²Ð°ÑÐ¸Ð¼ Ð·Ð°ÑÑÐµÐ²Ð¾Ð¼."
+msgstr "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ! ÐÐ¾Ð³Ð¾Ð´Ð¸Ð»Ð° ÑÐµ Ð³ÑÐµÑÐºÐ° ÑÐ° Ð²Ð°ÑÐ¸Ð¼ 
Ð·Ð°ÑÑÐµÐ²Ð¾Ð¼."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -48,7 +48,7 @@ msgstr "ÐÐ·Ð²Ð¾ÑÐ½Ð¸ ÐºÐ¾Ð´"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Promena loga"
+msgstr "ÐÑÐ¾Ð¼ÐµÐ½Ð° Ð»Ð¾Ð³Ð°"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
@@ -64,7 +64,7 @@ msgstr "ÐÑÐ¸ÐºÐ°Ð¶Ð¸ QRCode"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ"
+msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -83,7 +83,7 @@ msgstr "ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ 
Ð½Ð°Ð±Ð°Ð²Ð»ÑÐ°ÑÑ Ð²Ð°ÑÐµÐ³
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "QR ÐºÐ¾Ð´ ÑÐ°Ð´ÑÐ¶Ð¸ Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ. 
Ð¡ÐºÐµÐ½Ð¸ÑÐ°ÑÐµÑ Ð³Ð° ÑÐ° ÑÐ¸ÑÐ°ÑÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸ÑÑÐµ 
Ð¸ÑÐºÐ¾Ð¿Ð¸ÑÐ°Ð»Ð¸ Ð²Ð°ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ 
ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´ÑÑÐ³Ðµ ÑÑÐµÑÐ°ÑÐµ."
+msgstr "QR ÐºÐ¾Ð´ ÑÐ°Ð´ÑÐ¶Ð¸ Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ°. 
Ð¡ÐºÐµÐ½Ð¸ÑÐ°ÑÐµÑ Ð³Ð° ÑÐ° ÑÐ¸ÑÐ°ÑÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸ÑÑÐµ 
Ð¸ÑÐºÐ¾Ð¿Ð¸ÑÐ°Ð»Ð¸ Ð²Ð°ÑÐµ Ð»Ð¸Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐ° Ð½Ð° 
Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´ÑÑÐ³Ðµ ÑÑÐµÑÐ°ÑÐµ."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
@@ -104,7 +104,7 @@ msgstr "ÐÐ¾ÑÐ°Ðº %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "ÐÑÐµÑÐ·Ð¼Ð¸ÑÐµ %s Ð¢Ð¾Ñ Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ %s"
+msgstr "ÐÑÐµÑÐ·Ð¼Ð¸ÑÐµ %s Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ Ð¢Ð¾Ñ %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -124,7 +124,7 @@ msgstr "ÐÐ¾ÑÐ°Ðº %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°ÑÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ Ð¢Ð¾Ñ 
Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ %s"
+msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°ÑÑÐµ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ Ñ 
Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð°Ñ Ð¢Ð¾Ñ%s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -191,7 +191,7 @@ msgstr "ÐÐ¾Ð±ÑÐ¾Ð´Ð¾ÑÐ»Ð¸ Ñ BridgeDB!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð½Ð¸ transport TYPEs:"
+msgstr "Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð½Ð¸ Ð¢ÐÐ Ð¿ÑÐµÐ½Ð¾ÑÐ°:"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -228,7 +228,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸ÑÐ¸ Ð¼Ð¾ÑÑÐ¾Ð²Ðµ ÑÐ° Ð²Ð¸ÑÐµ %s 
ÑÐ¸Ð¿Ð¾Ð²Ð° Pluggable Transports %s,\nÑÑÐ¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ 
Ð¿ÑÐ¸ÐºÑÐ¸Ð²Ð°ÑÑ Ð²Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÐµÐºÑÐ¸ÑÐ° ÑÐ° Ð¢Ð¾Ñ ÐÑÐµÐ¶Ð¾Ð¼ 
Ð´Ð° Ð±Ð¸ Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ð¼Ðµ ÐºÐ¾\nÐ¿Ð¾ÑÐ¼Ð°ÑÑÐ° Ð²Ð°Ñ Ð¸Ð½ÑÐµÐ½ÐµÑ 
ÑÐ°Ð¾Ð±ÑÐ°ÑÐ°Ñ Ð±Ð¸Ð»Ð¾ ÑÐµÐ¶Ðµ Ð´Ð° ÑÑÐ²ÑÐ´Ð¸ Ð´Ð° ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ 
Ð¢Ð¾Ñ.\n\n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸ÑÐ¸ Ð¿ÑÐµÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÑÐµ ÑÐ° 
Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ %s ÑÐ¸Ð¿Ð¾Ð²Ð° Ð¿ÑÐ¸ÐºÑÑÑÐ½Ð¸Ñ Ð¿ÑÐµÐ½Ð¾ÑÐ° 
%s,\nÑÑÐ¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ Ð¿ÑÐ¸ÐºÑÐ¸Ð²Ð°ÑÑ Ð²Ð°ÑÐ¸Ñ 
ÐºÐ¾Ð½ÐµÐºÑÐ¸ÑÐ° ÑÐ° ÐÑÐµÐ¶Ð¾Ð¼ Ð¢Ð¾Ñ, ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð±Ð¸Ð»Ð¾\nÐºÐ¾Ð¼Ðµ 
ÐºÐ¾ Ð¿Ð¾ÑÐ¼Ð°ÑÑÐ° Ð²Ð°Ñ Ð¸Ð½ÑÐµÐ½ÐµÑ ÑÐ°Ð¾Ð±ÑÐ°ÑÐ°Ñ

[tor-commits] [tor-messenger-build/master] Update Unnamed Messenger logo

2015-10-13 Thread sukhbir

commit 458ea2bde1aa0ea912ebf9c2b410251587aeeec8
Author: Sukhbir Singh 
Date:   Tue Oct 13 15:20:36 2015 -0400

Update Unnamed Messenger logo
---
 projects/instantbird/branding/about.png |  Bin 10728 -> 10718 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/projects/instantbird/branding/about.png 
b/projects/instantbird/branding/about.png
index 8dbd586..99e5969 100644
Binary files a/projects/instantbird/branding/about.png and 
b/projects/instantbird/branding/about.png differ

___
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-10-13 Thread translation

commit ad4bbe3b33668c1299766bf73d4a92ab07d923f9
Author: Translation commit bot 
Date:   Tue Oct 13 18:45:03 2015 +

Update translations for bridgedb
---
 eu/LC_MESSAGES/bridgedb.po |  337 ++--
 1 file changed, 169 insertions(+), 168 deletions(-)

diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index fa14576..8403116 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -11,14 +11,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-07-12 15:59+\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2015-10-13 18:35+\n"
 "Last-Translator: javikitz \n"
-"Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n"
+"Language-Team: Basque 
(http://www.transifex.com/otf/torproject/language/eu/)\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"
+"Generated-By: Babel 1.3\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -33,57 +34,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Eman errore baten berri"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Iturburu-kodea"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontaktuan jarri."
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Hautatu dena"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Erakutsi QR Kodea"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Momentuz ez daude zubirik..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Agian saiatu  %s atzera itzuli %s eta beste zubi mota bat aukeratzen!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1.%s urratsa"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Jaitsi %s Tor Nabigatzailea %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2.%s urratsa"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Eskuratu %s zubiak %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3.%s urratsa"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Orain %s gehitu zubiak Torera %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Aukera Aurreratuak"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ez"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Bat ere ez."
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS:

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2015-10-13 Thread translation

commit d255cbd375bf73a57e0fba7edb620fa1d5310654
Author: Translation commit bot 
Date:   Tue Oct 13 20:45:40 2015 +

Update translations for tor-launcher-network-settings_completed
---
 ar/network-settings.dtd |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd
index c307e6c..b65f290 100644
--- a/ar/network-settings.dtd
+++ b/ar/network-settings.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -9,16 +9,18 @@
 
 
 
-
+
 
 
 
 
 
-
+
+
 
-
+
 
+
 
 
 
@@ -30,7 +32,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2015-10-13 Thread translation

commit 03528ec4b1335bbc654ce699ca06f450fc4e09b7
Author: Translation commit bot 
Date:   Tue Oct 13 20:45:35 2015 +

Update translations for tor-launcher-network-settings
---
 ar/network-settings.dtd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd
index 8efd716..b65f290 100644
--- a/ar/network-settings.dtd
+++ b/ar/network-settings.dtd
@@ -9,18 +9,18 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
-
+
 
 
 

___
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-10-13 Thread translation

commit d3ed7ad14a9f0beb35f75046c20b0b9f50f79d2a
Author: Translation commit bot 
Date:   Tue Oct 13 20:46:29 2015 +

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

diff --git a/ar/irc.properties b/ar/irc.properties
index 942be7a..26d40ce 100644
--- a/ar/irc.properties
+++ b/ar/irc.properties
@@ -187,7 +187,7 @@ tooltip.registered=Registered
 tooltip.registeredAs=Registered as
 tooltip.secure=Using a secure connection
 # The away message of the user
-tooltip.away=Away
+tooltip.away=Ø¨Ø¹ÙØ¯
 tooltip.ircOp=IRC Operator
 tooltip.bot=Bot
 tooltip.lastActivity=Last activity

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

[tor-commits] [tor-messenger-build/master] Rename start-tor-messenger.desktop file

2015-10-13 Thread sukhbir

commit 3eeb00ea4f74c9678ac79dc7d8d4d82697423cd3
Author: Sukhbir Singh 
Date:   Tue Oct 13 17:35:53 2015 -0400

Rename start-tor-messenger.desktop file
---
 projects/tor-messenger/start-tor-messenger.desktop |   34 
 .../tor-messenger/start-unnamed-messenger.desktop  |   34 
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/projects/tor-messenger/start-tor-messenger.desktop 
b/projects/tor-messenger/start-tor-messenger.desktop
deleted file mode 100644
index 3c5f92f..000
--- a/projects/tor-messenger/start-tor-messenger.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ./Messenger/execdesktop
-#
-# This file is a self-modifying .desktop file that can be run from the shell.
-# It preserves arguments and environment for the start-unnamed-messenger 
script.
-#
-# Run './start-unnamed-messenger.desktop --help' to display the full set of 
options.
-#
-# When invoked from the shell, this file must always be in a Unnamed Messenger
-# root directory. When run from the file manager or desktop GUI, it is
-# relocatable.
-#
-# After first invocation, it will update itself with the absolute path to the
-# current TBB location, to support relocation of this .desktop file for GUI
-# invocation. You can also add Unnamed Messenger to your desktop's application
-# menu by running './start-unnamed-messenger.desktop --register-app'
-#
-# If you use --register-app, and then relocate your TBB directory, Unnamed
-# Messenger will no longer launch from your desktop's app launcher/dock.
-# However, if you re-run --register-app from inside that new directory, the
-# script will correct the absolute paths and re-register itself.
-#
-# This file will also still function if the path changes when TBB is used as a
-# portable app, so long as it is run directly from that new directory, either
-# via the shell or via the file manager.
-
-[Desktop Entry]
-Type=Application
-Name=Unnamed Messenger Setup
-GenericName=Instant Messenger
-Comment=Unnamed Messenger is +1 for privacy and -1 for mass surveillance
-Categories=Network;Chat;Security;
-Exec=sh -c '"$(dirname "$*")"/Messenger/start-unnamed-messenger --detach || ([ 
! -x "$(dirname "$*")"/Messenger/start-unnamed-messenger ] && "$(dirname 
"$*")"/start-unnamed-messenger --detach)' dummy %k
-X-TorMessenger-ExecShell=./Messenger/start-unnamed-messenger --detach
-Icon=instant-messenger
diff --git a/projects/tor-messenger/start-unnamed-messenger.desktop 
b/projects/tor-messenger/start-unnamed-messenger.desktop
new file mode 100644
index 000..3c5f92f
--- /dev/null
+++ b/projects/tor-messenger/start-unnamed-messenger.desktop
@@ -0,0 +1,34 @@
+#!/usr/bin/env ./Messenger/execdesktop
+#
+# This file is a self-modifying .desktop file that can be run from the shell.
+# It preserves arguments and environment for the start-unnamed-messenger 
script.
+#
+# Run './start-unnamed-messenger.desktop --help' to display the full set of 
options.
+#
+# When invoked from the shell, this file must always be in a Unnamed Messenger
+# root directory. When run from the file manager or desktop GUI, it is
+# relocatable.
+#
+# After first invocation, it will update itself with the absolute path to the
+# current TBB location, to support relocation of this .desktop file for GUI
+# invocation. You can also add Unnamed Messenger to your desktop's application
+# menu by running './start-unnamed-messenger.desktop --register-app'
+#
+# If you use --register-app, and then relocate your TBB directory, Unnamed
+# Messenger will no longer launch from your desktop's app launcher/dock.
+# However, if you re-run --register-app from inside that new directory, the
+# script will correct the absolute paths and re-register itself.
+#
+# This file will also still function if the path changes when TBB is used as a
+# portable app, so long as it is run directly from that new directory, either
+# via the shell or via the file manager.
+
+[Desktop Entry]
+Type=Application
+Name=Unnamed Messenger Setup
+GenericName=Instant Messenger
+Comment=Unnamed Messenger is +1 for privacy and -1 for mass surveillance
+Categories=Network;Chat;Security;
+Exec=sh -c '"$(dirname "$*")"/Messenger/start-unnamed-messenger --detach || ([ 
! -x "$(dirname "$*")"/Messenger/start-unnamed-messenger ] && "$(dirname 
"$*")"/start-unnamed-messenger --detach)' dummy %k
+X-TorMessenger-ExecShell=./Messenger/start-unnamed-messenger --detach
+Icon=instant-messenger

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

[tor-commits] [tor-messenger-build/master] Fix typo in start-unnamed-messenger

2015-10-13 Thread sukhbir

commit 5887e0c78ac551ae3060fb6b6cdcefd2929c9073
Author: Sukhbir Singh 
Date:   Tue Oct 13 20:03:24 2015 -0400

Fix typo in start-unnamed-messenger
---
 projects/tor-messenger/start-unnamed-messenger |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/tor-messenger/start-unnamed-messenger 
b/projects/tor-messenger/start-unnamed-messenger
index 974330a..4f98506 100755
--- a/projects/tor-messenger/start-unnamed-messenger
+++ b/projects/tor-messenger/start-unnamed-messenger
@@ -236,7 +236,7 @@ fi
 # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the
 # canonical version if it was changed by the updater.
 cp start-unnamed-messenger.desktop ../
-sed -i -e "s,^Name=.*,Name=Unnamed Messenger,g" ../start-tor-messenger.desktop
+sed -i -e "s,^Name=.*,Name=Unnamed Messenger,g" 
../start-unnamed-messenger.desktop
 sed -i -e "s,^Icon=.*,Icon=$PWD/chrome/icons/default/default48.png,g" 
../start-unnamed-messenger.desktop
 sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-unnamed-messenger\" --detach || 
([ !  -x \"$PWD/start-unnamed-messenger\" ] \&\& \"\$(dirname 
\"\$*\")\"/Messenger/start-unnamed-messenger --detach)' dummy %k,g" 
../start-unnamed-messenger.desktop
 

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

[tor-commits] [tor-messenger-build/master] Add patch for hiding 'Get more protocols...' link

[tor-commits] [torbutton/master] Bug 9263: Spoof referer when leaving a .onion domain

[tor-commits] [torbutton/master] Revert "remove obsolete files, re Bug 1506 P0"

[tor-commits] [tor-browser-bundle/master] Revert "Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes""

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

[tor-commits] [tor-browser-bundle/master] Bug 17220: Bundle STIX Math font for Linux and OS X

[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.

[tor-commits] [tor-browser-bundle/master] Bug 16909: Workaround for old git in 10.04

[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-2] Revert "Back out changes for bug 16909"

[tor-commits] [torbutton/maint-1.9.3] Revert "remove obsolete files, re Bug 1506 P0"

[tor-commits] [torbutton/maint-1.9.3] Bug 9263: Spoof referer when leaving a .onion domain

[tor-commits] [translation/tails-misc] Update translations for tails-misc

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

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

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

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

[tor-commits] [translation/tails-misc] Update translations for tails-misc

[tor-commits] [tor-messenger-build/master] Rebrand Tor Messenger as Unnamed Messenger

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

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

[tor-commits] [tor-messenger-build/master] Update directory path for ctypes-otr

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

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

[tor-commits] [tor-messenger-build/master] Update Unnamed Messenger logo

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

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

[tor-commits] [tor-messenger-build/master] Rename start-tor-messenger.desktop file

[tor-commits] [tor-messenger-build/master] Fix typo in start-unnamed-messenger

30 matches

Site Navigation

Mail list logo

Footer information