date:20181115

[tor-commits] [tor/maint-0.3.4] Appveyor: manually add zstd flags to configure

2018-11-15 Thread nickm

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed
Author: teor 
Date:   Thu Nov 15 18:32:52 2018 +1000

Appveyor: manually add zstd flags to configure

The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
---
 .appveyor.yml| 2 +-
 changes/bug28454 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fdf831686..c288ad812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28454 b/changes/bug28454
new file mode 100644
index 0..ca46ae277
--- /dev/null
+++ b/changes/bug28454
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Manually configure the zstd compiler options, when building using
+  mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+  come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/maint-0.3.4] Appveyor: remove incorrect OpenSSL path

2018-11-15 Thread nickm

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor 
Date:   Thu Nov 15 14:32:53 2018 +1000

Appveyor: remove incorrect OpenSSL path

Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml| 4 +---
 changes/bug28399 | 4 
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
 compiler_path: mingw32
-openssl_path: /c/OpenSSL-Win32
 mingw_prefix: mingw-w64-i686
 hardening:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
-openssl_path: /c/OpenSSL-Win64
 mingw_prefix: mingw-w64-x86_64
 hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 0..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Stop using an external OpenSSL install, and stop installing MSYS2
+  packages, when building using mingw on Appveyor Windows CI.
+  Fixes bug 28399; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/maint-0.3.4] Appveyor: Improve diagnostics

2018-11-15 Thread nickm

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372
Author: teor 
Date:   Thu Nov 15 13:43:20 2018 +1000

Appveyor: Improve diagnostics

Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..4069a5396 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
-Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm 
openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent 
${env:mingw_prefix}-zstd ;
+Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-



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

[tor-commits] [webwml/master] Modify metrics job post

2018-11-15 Thread hiro

commit 4fc2976c069b16e6cca6cd8f0efc19b2d4a31088
Author: hiro 
Date:   Tue Nov 6 08:25:52 2018 +0100

Modify metrics job post
---
 about/en/jobs-metrics-data-architect.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-metrics-data-architect.wml 
b/about/en/jobs-metrics-data-architect.wml
index b9b2c38a..ee94d104 100644
--- a/about/en/jobs-metrics-data-architect.wml
+++ b/about/en/jobs-metrics-data-architect.wml
@@ -88,13 +88,13 @@
   You support Internet Freedom!
 
 
-This is a full-time position that can be done remotely/internationally or 
in our office in Seattle, WA. To apply, send a cover letter that includes a 
statement about why you want to work at the Tor Project, your CV/resume 
(including three professional references), and a link to a code sample or some 
non-trivial software project you have significantly contributed to. All 
documents should be in PDF format labeled with your name. Please send to 
job-metrics at torproject dot org with âMetrics Data Architectâ in the 
subject line. No phone calls please!
+This is a full-time position that can be done remotely/internationally or 
in our office in Seattle, WA. To apply, send a cover letter that includes a 
statement about why you want to work at the Tor Project, your CV/resume 
(including three professional references), and a link to a code sample or some 
non-trivial software project you have significantly contributed to. All 
documents should be in PDF format labeled with your name. Please send to 
job-metrics at torproject dot org with âMetrics Data Architectâ in the 
subject line. No phone calls please!
 
 
 Flexible salary, depending on experience. The Tor Project has a highly 
competitive benefits package, including a generous PTO policy; paid holidays 
(including the week between Christmas and New Year's, when the office is 
closed); health, vision, dental, disability, and life insurance paid in full 
for employee; 401(k); and flexible work schedule. (Please note that benefits 
package specifics can vary slightly from country to country, but we aim to 
treat everyone equally.)
 
 
-The Tor Project's workforce is smart and committed. The Tor Project 
currently has a paid and contract staff of around 47 developers and operational 
support staff, plus many thousands of volunteers who contribute to our work. 
The Tor Project is funded in part by government research and development 
grants, and in part by individual, foundation and corporate donations. If 
youâre new to the Tor Project scene, are curious what our workplace culture 
is like, or just want to read about how fun our semi-annual meetings are, hear 
what our new Development Director had to say about all of it: 
https://blog.torproject.org/reflections-tor-meeting-newbie
+The Tor Project's workforce is smart and committed. The Tor Project 
currently has a paid and contract staff of around 47 developers and operational 
support staff, plus many thousands of volunteers who contribute to our work. 
The Tor Project is funded in part by government research and development 
grants, and in part by individual, foundation and corporate donations. If 
youâre new to the Tor Project scene, are curious what our workplace culture 
is like, or just want to read about how fun our semi-annual meetings are, hear 
what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie;>https://blog.torproject.org/reflections-tor-meeting-newbie.
 
 
 The Tor Project, Inc., is an equal opportunity, affirmative action 
employer.



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

[tor-commits] [webwml/master] Add possibility to close banner

2018-11-15 Thread hiro

commit b805607470b9b11d8980b3688a287c0659a4c0ab
Author: hiro 
Date:   Tue Nov 6 19:49:13 2018 +0100

Add possibility to close banner
---
 css/layout.css |  30 +
 css/layout.min.css |  30 +
 en/banner2.wmi |   4 +-
 en/index.wml   |  42 +-
 include/head-index.wmi | 116 +
 5 files changed, 220 insertions(+), 2 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index 3d6453c2..4b18d223 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -1533,3 +1533,33 @@ mark {
   font-size-adjust: 0.7;
   line-height: 1.5em;
 }
+
+/* Checkbox Hack */
+
+input[type=checkbox] {
+   position: absolute;
+   top: -px;
+   left: -px;
+}
+
+label {
+  -webkit-appearance: push-button;
+  -moz-appearance: button;
+  display: inline-block;
+  cursor: pointer;
+  color: white;
+  float: right;
+  font-weight: bold;
+  padding-right: 5px;
+  padding-top: 5px;
+}
+
+#eoy-banner {
+  visibility: visible;
+}
+
+/* Toggled State */
+input[type=checkbox]:checked ~ div#eoy-banner {
+   visibility: hidden;
+   display: none;
+}
diff --git a/css/layout.min.css b/css/layout.min.css
index 17969bb5..130283a0 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -132,3 +132,33 @@ mark {
   font-size-adjust: 0.7;
   line-height: 1.5em;
 }
+
+/* Checkbox Hack */
+
+input[type=checkbox] {
+   position: absolute;
+   top: -px;
+   left: -px;
+}
+
+label {
+  -webkit-appearance: push-button;
+  -moz-appearance: button;
+  display: inline-block;
+  cursor: pointer;
+  color: white;
+  float: right;
+  font-weight: bold;
+  padding-right: 5px;
+  padding-top: 5px;
+}
+
+#eoy-banner {
+  visibility: visible;
+}
+
+/* Toggled State */
+input[type=checkbox]:checked ~ div#eoy-banner {
+   visibility: hidden;
+   display: none;
+}
diff --git a/en/banner2.wmi b/en/banner2.wmi
index 3504994b..d21cc17d 100644
--- a/en/banner2.wmi
+++ b/en/banner2.wmi
@@ -1,4 +1,6 @@
-
+x
+
+
   
 
   
diff --git a/en/index.wml b/en/index.wml
index f99eeed5..73d1e6e0 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -1,8 +1,48 @@
 ## translation metadata
 # Revision: $Revision$
 # Translation-Priority: 1-high
+
+
+
+
+ 
+ 
+
+   
+   
+   
+   
+   mailto:get...@torproject.org] for 
help downloading Tor Browser.">
+   
+   https://www.torproject.org/images/tor-logo.jpg;>
+{#meta#}
+
+   $(TITLE)
+
+   
+   ">
+   ">
+
+   # begin WML to generate css/js paths
+   ">
+   ">
+
+   #
+   
+   
+   
+   #  
+   # end WML to generate css/js paths
+
+
 #include "banner2.wmi"
-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
+#include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
 
 

diff --git a/include/head-index.wmi b/include/head-index.wmi
new file mode 100644
index ..e491a844
--- /dev/null
+++ b/include/head-index.wmi
@@ -0,0 +1,116 @@
+#! /usr/bin/wml
+<: use strict; :>
+<: use warnings; :>
+#use "perl-globals.wmi"
+#use "links.wmi"
+#use "versions.wmi"
+#use "navigation.wmi"
+
+
+
+  
+Tor
+  # navigation menu generation
+  
+
+<:{
+# create a hash and maintain order of keys
+my %navigation;
+my @keys;
+while (@navigation) {
+  my $key = shift @navigation;
+  my $val = shift @navigation;
+  push @keys, $key;
+  $navigation{$key} = $val;
+}
+
+my $page = $WML_SRC_BASENAME;
+my $lang = "$(LANG)";
+
+for my $key (@keys) {
+  my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
+
+  # in directory of active link, set class active. This rule 
should be improved with proper structuring of the links.
+  my $class;
+  if ((index($page, 'contact') ne -1) and (index($base, 
'overview') ne -1)) {
+$class = '';
+  } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and 
(index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) {
+$class = 'class="active '.$base.' '.$page.'"';
+  } else {
+$class = '';
+  }
+
+   $dir = '.' unless defined $dir;
+
+  # translated version
+  if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
+  printf '%s'."\n",
+ 
stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
+  }
+  # english version
+  elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
+   printf '%s'."\n",
+  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), 
$navigation{$key};
+  }
+  # full url
+  elsif ($key =~/^http/) {
+printf '%s'."\n", $key, 
$navigation{$key};
+  } else {
+warn "$WML_SRC_FILENAME has a [page $key] (parses to
+docdir: $(DOCROOT)/;

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

2018-11-15 Thread translation

commit dbf524163f015ec2643334a8721d7da70cb395e2
Author: Translation commit bot 
Date:   Thu Nov 15 16:49:34 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ur/browserOnboarding.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ur/browserOnboarding.properties b/ur/browserOnboarding.properties
index fda1aa325..ca4ee1d0f 100644
--- a/ur/browserOnboarding.properties
+++ b/ur/browserOnboarding.properties
@@ -22,7 +22,7 @@ onboarding.tour-tor-circuit-display.title=See your path.
 onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking âNew Circuit for this Siteâ on our 
Circuit Display.
 onboarding.tour-tor-circuit-display.button=See My Path
 
-onboarding.tour-tor-security=Security
+onboarding.tour-tor-security=Ø³ÛÚ©ÛÙØ±Ù¹Û
 onboarding.tour-tor-security.title=Choose your experience.
 onboarding.tour-tor-security.description=We also provide you with additional 
settings for bumping up your browser security. Our Security Settings allow you 
to block elements that could be used to attack your computer. Click below to 
see what the different options do.
 onboarding.tour-tor-security.button=Review Settings
@@ -39,7 +39,7 @@ onboarding.tour-tor-onion-services.button=Visit an Onion
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=Ø§Ú¯ÙØ§ 
-onboarding.tor-circuit-display.done=Done
+onboarding.tor-circuit-display.done=ÙÚ©ÙÙ ÛÙÚ¯ÛØ§
 onboarding.tor-circuit-display.one-of-three=1 of 3
 onboarding.tor-circuit-display.two-of-three=2 of 3
 onboarding.tor-circuit-display.three-of-three=3 of 3

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

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

2018-11-15 Thread translation

commit e975df201c2d88ad1971e8d39ee393367da5f18c
Author: Translation commit bot 
Date:   Thu Nov 15 16:49:11 2018 +

Update translations for torbutton-aboutdialogdtd
---
 ur/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/aboutdialog.dtd b/ur/aboutdialog.dtd
index 2a20c3d0c..d02b8592d 100644
--- a/ur/aboutdialog.dtd
+++ b/ur/aboutdialog.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

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

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

2018-11-15 Thread translation

commit ba78288b44a33447bfd6a133921fcd7bce744180
Author: Translation commit bot 
Date:   Thu Nov 15 16:48:43 2018 +

Update translations for torbutton-branddtd_completed
---
 ur/brand.dtd | 16 
 1 file changed, 16 insertions(+)

diff --git a/ur/brand.dtd b/ur/brand.dtd
new file mode 100644
index 0..1a6275d13
--- /dev/null
+++ b/ur/brand.dtd
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2018-11-15 Thread translation

commit 88b96f19327c720ddb0a61620c4790fd3bfc5163
Author: Translation commit bot 
Date:   Thu Nov 15 17:15:22 2018 +

Update translations for bridgedb_completed
---
 ko/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index b751b9a9d..1a0b37416 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -22,11 +22,11 @@
 # Revi_, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: 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: 2018-09-21 19:17+\n"
-"Last-Translator: Philipp Sauter \n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2018-11-15 Thread translation

commit 1eb7d51a1cd2789d9768f2e1949aacb8e31357ff
Author: Translation commit bot 
Date:   Thu Nov 15 17:15:15 2018 +

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

diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index b751b9a9d..1a0b37416 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -22,11 +22,11 @@
 # Revi_, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: 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: 2018-09-21 19:17+\n"
-"Last-Translator: Philipp Sauter \n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2018-11-15 Thread translation

commit a829bcda2aeac48bbcc4aa17302723eab4b5c91d
Author: Translation commit bot 
Date:   Thu Nov 15 15:20:06 2018 +

Update translations for support-portal_completed
---
 contents+bn.po| 15 ---
 contents+ca.po| 15 ---
 contents+de.po| 15 ---
 contents+es-AR.po | 15 ---
 contents+es.po| 15 ---
 contents+fr.po| 15 ---
 contents+ga.po| 15 ---
 contents+id.po| 14 --
 contents+it.po| 15 ---
 contents+pt-BR.po | 15 ---
 contents+tr.po| 15 ---
 contents+zh-CN.po | 13 -
 contents.pot  | 17 +
 13 files changed, 53 insertions(+), 141 deletions(-)

diff --git a/contents+bn.po b/contents+bn.po
index e40cabc8a..aa8ceb463 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-15 13:05+CET\n"
+"POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -2623,8 +2623,10 @@ msgstr ""
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
+#: http//localhost/censorship/censorship-5/
+#: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these  in your Tor log, it means you are failing to "
+"If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
 "à¦¯à¦¦à¦¿ à¦à¦ªà¦¨à¦¿ à¦à¦ªà¦¨à¦¾à¦° à¦à¦° à¦²à¦à§ à¦à¦ 
à¦§à¦°à¦¨à§à¦° à¦²à¦¾à¦à¦¨à¦à§à¦²à§ à¦¦à§à¦à§à¦¨, à¦à¦° à¦®à¦¾à¦¨à§ 
à¦à¦ªà¦¨à¦¿ à¦à¦à¦à¦¿ à¦®à§à¦à¦¾ "
@@ -2985,15 +2987,6 @@ msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°à§à¦°-à¦¸à¦¾à¦¥à§-à¦¸à¦à¦¯à§à¦-à¦
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these in your Tor log, it means you are failing to "
-"connect to a SOCKS proxy."
-msgstr ""
-"à¦¯à¦¦à¦¿ à¦à¦ªà¦¨à¦¿ à¦à¦ªà¦¨à¦¾à¦° à¦à¦° à¦²à¦à§ à¦à¦ 
à¦§à¦°à¦¨à§à¦° à¦²à¦¾à¦à¦¨à¦à§à¦²à§ à¦¦à§à¦à§à¦¨, à¦à¦° à¦®à¦¾à¦¨à§ 
à¦à¦ªà¦¨à¦¿ à¦à¦à¦à¦¿ à¦®à§à¦à¦¾ "
-"à¦ªà§à¦°à¦à§à¦¸à¦¿à¦° à¦¸à¦¾à¦¥à§ à¦¸à¦à¦¯à§à¦ à¦à¦°à¦¤à§ 
à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à¦¨ à¥¤"
-
-#: http//localhost/censorship/censorship-5/
-#: (content/censorship/censorship-5/contents+en.lrquestion.description)
-msgid ""
 "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time "
 "(OR:xxx.xx.x.xx:): It seems that our clock is behind by 1 days, 0 hours,"
 " 1 minutes, or that theirs is ahead."
diff --git a/contents+ca.po b/contents+ca.po
index 978afd383..24bf585a7 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-15 13:05+CET\n"
+"POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -2653,8 +2653,10 @@ msgstr ""
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
+#: http//localhost/censorship/censorship-5/
+#: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these  in your Tor log, it means you are failing to "
+"If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
 "Si veieu lÃnies com aquestes al vostre registre de Tor, significa que no "
@@ -3014,15 +3016,6 @@ msgstr "no-puc-connectar-navegador-tor"
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these in your Tor log, it means you are failing to "
-"connect to a SOCKS proxy."
-msgstr ""
-"Si veieu lÃnies com aquestes al vostre registre de Tor, significa que no "
-"esteu connectant a un proxy SOCKS."
-
-#: http//localhost/censorship/censorship-5/
-#: (content/censorship/censorship-5/contents+en.lrquestion.description)
-msgid ""
 "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time "
 "(OR:xxx.xx.x.xx:): It seems that our clock is behind by 1 days, 0 hours,"
 " 1 minutes, or that theirs is ahead."
diff --git a/contents+de.po b/contents+de.po
index 147a5105a..226d02f38 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-15 13:05+CET\n"
+"POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"

[tor-commits] [webwml/master] 0.3.5.4-alpha is released

2018-11-15 Thread hiro

commit 51ec2607ab0d58e8c5ab949738a9f70e8c670d85
Author: Nick Mathewson 
Date:   Thu Nov 8 08:11:21 2018 -0500

0.3.5.4-alpha is released
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7bb787d6..0837ffbc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.4.9
-export DEVTAG=tor-0.3.5.3-alpha
+export DEVTAG=tor-0.3.5.4-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 154041f6..74d4f3e9 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.4.9
-0.3.5.3-alpha
+0.3.5.4-alpha
 
 maint-7.5
 



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

[tor-commits] [webwml/master] Update css for banner

2018-11-15 Thread hiro

commit 8a3d7f046903dab0fb4a5018d11a097702ed0bf6
Author: hiro 
Date:   Wed Nov 7 15:05:57 2018 +0100

Update css for banner
---
 css/layout.css | 7 ---
 css/layout.min.css | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index 4b18d223..db89f7c7 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -1531,7 +1531,7 @@ mark {
   width: 100%;
   align-content: center;
   font-size-adjust: 0.7;
-  line-height: 1.5em;
+  line-height: 1.0em;
 }
 
 /* Checkbox Hack */
@@ -1550,8 +1550,9 @@ label {
   color: white;
   float: right;
   font-weight: bold;
-  padding-right: 5px;
-  padding-top: 5px;
+  padding-right: 15px;
+  padding-top: 15px;
+  font-size: 20px;
 }
 
 #eoy-banner {
diff --git a/css/layout.min.css b/css/layout.min.css
index 130283a0..eb48f1fb 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -130,7 +130,7 @@ mark {
   width: 100%;
   align-content: center;
   font-size-adjust: 0.7;
-  line-height: 1.5em;
+  line-height: 1.0em;
 }
 
 /* Checkbox Hack */
@@ -149,8 +149,9 @@ label {
   color: white;
   float: right;
   font-weight: bold;
-  padding-right: 5px;
-  padding-top: 5px;
+  padding-right: 15px;
+  padding-top: 15px;
+  font-size: 20px;
 }
 
 #eoy-banner {



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

[tor-commits] [webwml/master] Redirect support to support.tp.o

2018-11-15 Thread hiro

commit 5d6789701cecca63518bfa481c974b86f7e6b54f
Author: hiro 
Date:   Mon Nov 12 23:14:59 2018 +0100

Redirect support to support.tp.o
---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index c1f0557c..02d80f25 100644
--- a/.htaccess
+++ b/.htaccess
@@ -48,7 +48,7 @@ RewriteRule ^research(.*) https://research.torproject.org/ 
[R=301,L]
 RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ 
[R=301,L]
 
 # Support
-RewriteRule ^support(.*) 
https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support 
[R=301,L]
+RewriteRule ^support(.*) https://support.torproject.org [R=301,L]
 
 # Newsletter
 RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L]



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

[tor-commits] [webwml/master] Fix spanish index banner

2018-11-15 Thread hiro

commit 031dae8813a2c64ba9ed35c859b8146ad6e062b2
Author: hiro 
Date:   Tue Nov 6 19:54:08 2018 +0100

Fix spanish index banner
---
 es/banner2.wmi |  4 +++-
 es/index.wml   | 42 +-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/es/banner2.wmi b/es/banner2.wmi
index 3504994b..d21cc17d 100644
--- a/es/banner2.wmi
+++ b/es/banner2.wmi
@@ -1,4 +1,6 @@
-
+x
+
+
   
 
   
diff --git a/es/index.wml b/es/index.wml
index a720b87c..af65d7f0 100644
--- a/es/index.wml
+++ b/es/index.wml
@@ -1,8 +1,48 @@
 ## translation metadata
 # Revision: $Revision$
 # Translation-Priority: 1-high
+
+
+
+
+ 
+ 
+
+   
+   
+   
+   
+   mailto:get...@torproject.org] for 
help downloading Tor Browser.">
+   
+   https://www.torproject.org/images/tor-logo.jpg;>
+{#meta#}
+
+   $(TITLE)
+
+   
+   ">
+   ">
+
+   # begin WML to generate css/js paths
+   ">
+   ">
+
+   #
+   
+   
+   
+   #  
+   # end WML to generate css/js paths
+
+
 #include "banner2.wmi"
-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
+#include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
 es-ES
 
 



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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-11-15 Thread translation

commit c86bc9cba39b5df0cb6c0cedd903a4c09b5dc68f
Author: Translation commit bot 
Date:   Thu Nov 15 16:49:57 2018 +

Update translations for tor-launcher-properties
---
 ur/torlauncher.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ur/torlauncher.properties b/ur/torlauncher.properties
index a4d097a76..caf020bbe 100644
--- a/ur/torlauncher.properties
+++ b/ur/torlauncher.properties
@@ -43,9 +43,9 @@ torlauncher.no_bridges_available=No bridges are available at 
this time. Sorry.
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
+torlauncher.quit=ÚÚ¾ÙÚØ¯ÛØ¬ÛÛ (Quit)
 torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.done=ÙÚ©ÙÙ ÛÙÚ¯ÛØ§
 
 torlauncher.forAssistance=For assistance, contact %S
 torlauncher.forAssistance2=For assistance, visit %S
@@ -59,7 +59,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network 
status
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
 torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
 torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
+torlauncher.bootstrapStatus.conn_or=Ù¹Ø§Ø± ÙÛÙ¹ ÙØ±Ú©Ø³ Ø³Û Ø±Ø§Ø¨Ø·Û 
Ø¨ÙØ§Ø¦ÛÚº
 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
 torlauncher.bootstrapStatus.done=Connected to the Tor network!
 

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

[tor-commits] [webwml/master] Merge branch 'press'

2018-11-15 Thread hiro

commit 0e1dd7fb89a5e6ea435de07f4e9f74b6fb508011
Merge: cbced75a 5d678970
Author: hiro 
Date:   Thu Nov 15 17:49:45 2018 +0100

Merge branch 'press'

 press/en/press.wml | 1789 +++-
 press/press.pl |   46 +-
 2 files changed, 1088 insertions(+), 747 deletions(-)

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

[tor-commits] [webwml/master] Add Hans-Christoph to the people page

2018-11-15 Thread hiro

commit e26dc351844c3008b244f781663f685987225cbe
Author: Damian Johnson 
Date:   Wed Nov 7 11:50:46 2018 -0800

Add Hans-Christoph to the people page
---
 about/en/corepeople.wml   | 134 +-
 images/people/hc.png  | Bin 0 -> 38444 bytes
 images/people/orig/hc.jpg | Bin 0 -> 149652 bytes
 3 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index b35e614b..1739cc85 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -311,6 +311,16 @@
 
   
 
+  
+  
+  https://twitter.com/hansstatus;>
+  https://pgp.mit.edu/pks/lookup?op=vindex=0xE9E28DEA00AA5556;>
+  Hans-Christoph Steiner
+  IRC: _hc
+  Works on Orbot, NetCipher, and integrating Tor 
everywhere possible, especially in Debian and Android.  Also deeply mixed into 
Guardian Project.
+
+
+
   
   
   
@@ -318,7 +328,9 @@
   IRC: nyinz
   I am very excited and honored to contribute to 
the Tor project on its mission to provide usable technologies to the global 
south.
 
+  
 
+  
 
   
   
@@ -329,9 +341,7 @@
   Pronoun: http://pronoun.is/he;>he
   https://metrics.torproject.org;>Metrics team member and maintainer of 
https://metrics.torproject.org/rs.html;>Relay Search.
 
-  
 
-  
 
   
   
@@ -340,7 +350,9 @@
   Pronoun: http://pronoun.is/he;>he
   https://cs.uwaterloo.ca/~iang/;>Professor of CS at the https://uwaterloo.ca/;>University of Waterloo, developing https://otr.cypherpunks.ca/;>Off-the-Record Messaging among other 
things.
 
+  
 
+  
 
   
   
@@ -350,9 +362,7 @@
   IRC: igt0
   Works on Tor Browser.
 
-  
 
-  
 
   
   
@@ -361,7 +371,9 @@
   Pronoun: http://pronoun.is/he;>he
   He is one of our main interfaces with the https://tails.boum.org/;>Tails project.
 
+  
 
+  
 
   
   
@@ -371,9 +383,7 @@
   IRC: isabela
   Coordinates Tor's development teams and 
roadmaps. Keeps track of priorities, and ensures Tor always thinks of the 
user first.
 
-  
 
-  
 
   
   
@@ -381,7 +391,9 @@
   isra
   Rewrote the https://gettor.torproject.org;>GetTor service.
 
+  
 
+  
 
   
   
@@ -391,9 +403,7 @@
   IRC: redshiftzero
   Lead developer of the https://securedrop.org/;>SecureDrop whistleblower platform based at 
the https://freedom.press/;>Freedom of the Press Foundation.
 
-  
 
-  
 
   
   
@@ -403,7 +413,9 @@
   IRC: qbi
   Volunteer that helped translate the website, is 
part of TorServers.net, and Tor's sysadmin team.
 
+  
 
+  
 
   
   
@@ -412,9 +424,7 @@
   IRC: jselon
   Event Coordination, donor management, general 
office operations.
 
-  
 
-  
 
   
   
@@ -423,7 +433,9 @@
   IRC: juga
   Contributed to OONI, bug tracker features, 
wrote tordyguards. Currently working on bandwidth scanner.
 
+  
 
+  
 
   
   
@@ -432,9 +444,7 @@
   Julius Mittenzwei
   Germany-based lawyer and Internet 
activist.
 
-  
 
-  
 
   
   
@@ -443,7 +453,9 @@
   IRC: juris
   Board member of torservers.net.
 
+  
 
+  
 
   
   
@@ -453,9 +465,7 @@
   Pronoun: http://pronoun.is/he;>he
   Primary researcher and developer into https://metrics.torproject.org/;>anonymous metrics which started as a 
National Science Foundation grant.
 
-  
 
-  
 
   
   
@@ -465,7 +475,9 @@
   Pronoun: http://pronoun.is/she;>she
   Volunteer on the Community Team. Helps with 
t-shirts for relay operators and other odds and ends.
 
+  
 
+  
 
   
   
@@ -475,9 +487,7 @@
   IRC: ailanthus
   Writes about Tor in mainstream and technical 
publications and conducts community workshops to teach people about Tor.
 
-  
 
-  
 
   
   
@@ -488,16 +498,16 @@
   Pronoun: http://pronoun.is/he;>he
   https://securedrop.org;>SecureDrop 
developer at the https://freedom.press;>Freedom of Press 
Foundation. Member of the community team, privacy advocate focusing on new 
users.
 
+  
 
+  
 
   
   
   Leif Ryge
   Works on security analysis, designer of 
bananaphone transport.
 
-  
 
-  
 
   
   
@@ -507,7 +517,9 @@
   Pronoun: http://pronoun.is/he;>he
   Software developer, sysadmin and co-founder of 
the Swedish Torservers.net partner :DFRI. Member of the sysadmin team. Runs one 
of the directory authorities.
 
+  
 
+  
 
   
   
@@ -517,9 +529,7 @@
   Pronoun: http://pronoun.is/she;>she
   Community team, user advocate, and Mozilla 
fellow.
 
-  
 
-  
 
   
   
@@ -530,7 +540,9 @@
   Pronoun: http://pronoun.is/she;>she
   Maria manages OONI's Partnership Program and 
writes research reports on internet censorship around

[tor-commits] [webwml/master] Switch fundraising banner

2018-11-15 Thread hiro

commit 872cba433351de5e5ad876f929773f5ad77471a9
Author: hiro 
Date:   Mon Nov 12 22:54:41 2018 +0100

Switch fundraising banner
---
 css/layout.css | 4 
 css/layout.min.css | 4 
 en/banner.wmi  | 2 ++
 en/index.wml   | 2 +-
 es/banner.wmi  | 2 ++
 es/index.wml   | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index db89f7c7..16cd3ef7 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -1564,3 +1564,7 @@ input[type=checkbox]:checked ~ div#eoy-banner {
visibility: hidden;
display: none;
 }
+
+.black {
+  color: black;
+}
diff --git a/css/layout.min.css b/css/layout.min.css
index eb48f1fb..4a4d8f65 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -163,3 +163,7 @@ input[type=checkbox]:checked ~ div#eoy-banner {
visibility: hidden;
display: none;
 }
+
+.black {
+  color: black;
+}
diff --git a/en/banner.wmi b/en/banner.wmi
index 35c13e7c..b11c8eab 100644
--- a/en/banner.wmi
+++ b/en/banner.wmi
@@ -1,3 +1,5 @@
+x
+
 
   
 
diff --git a/en/index.wml b/en/index.wml
index 73d1e6e0..320ea85d 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -41,7 +41,7 @@
# end WML to generate css/js paths
 
 
-#include "banner2.wmi"
+#include "banner.wmi"
 #include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
 
 
diff --git a/es/banner.wmi b/es/banner.wmi
index bb914cc8..047acbfd 100644
--- a/es/banner.wmi
+++ b/es/banner.wmi
@@ -1,3 +1,5 @@
+x
+
 
   
 
diff --git a/es/index.wml b/es/index.wml
index af65d7f0..3c0fd50e 100644
--- a/es/index.wml
+++ b/es/index.wml
@@ -41,7 +41,7 @@
# end WML to generate css/js paths
 
 
-#include "banner2.wmi"
+#include "banner.wmi"
 #include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
 es-ES
 



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

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

2018-11-15 Thread translation

commit 29f0dc9353930b47cf7a91ce0a832ac3abe05a5b
Author: Translation commit bot 
Date:   Thu Nov 15 16:50:20 2018 +

Update translations for whisperback
---
 ur/ur.po   | 16 
 zh_TW/zh_TW.po |  7 ---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index cb5938b43..56207c933 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -6,11 +6,11 @@
 # A. Saad Imran, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-08-07 08:48+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,16 +62,16 @@ msgstr ""
 
 #: ../whisperBack/gui.py:166
 msgid "Sending mail..."
-msgstr ""
+msgstr "Ù¾ÛØºØ§Ù Ø¨Ú¾ÛØ¬ Ø±ÛØ§ ÛÛÛÛÛ"
 
 #: ../whisperBack/gui.py:167
 msgid "Sending mail"
-msgstr ""
+msgstr "Ù¾ÛØºØ§Ù Ø¨Ú¾ÛØ¬ Ø±ÛØ§ ÛÛÛÛÛ"
 
 #. pylint: disable=C0301
 #: ../whisperBack/gui.py:169
 msgid "This could take a while..."
-msgstr ""
+msgstr "Ú©ÚÚ¾ Ø²ÛØ§Ø¯Û ÙÙØª Ø¯Ø±Ú©Ø§Ø± ÛÙ Ø³Ú©ØªØ§ ÛÛ ÛÛÛ"
 
 #: ../whisperBack/gui.py:185
 msgid "The contact email address doesn't seem valid."
@@ -135,7 +135,7 @@ msgstr ""
 
 #: ../whisperBack/gui.py:337
 msgid "Tails developers "
-msgstr ""
+msgstr "Tails developers "
 
 #: ../whisperBack/gui.py:338
 msgid "translator-credits"
@@ -151,7 +151,7 @@ msgstr ""
 
 #: ../data/whisperback.ui.h:3
 msgid "https://tails.boum.org/;
-msgstr ""
+msgstr "https://tails.boum.org/;
 
 #: ../data/whisperback.ui.h:4
 msgid ""
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 0cd099715..14cb8fed0 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -6,13 +6,14 @@
 # AgustÃn Wu , 2016-2017
 # danfong , 2014
 # x4r , 2014
+# åé¦ ç, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-10-04 00:48+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-11-15 16:20+\n"
+"Last-Translator: åé¦ ç\n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -202,7 +203,7 @@ msgstr ""
 
 #: ../data/whisperback.ui.h:27
 msgid "optional PGP key"
-msgstr "PGP éé°(éå¿è¦)"
+msgstr "PGP éé° (é¸ç¨)"
 
 #: ../data/whisperback.ui.h:28
 msgid "Technical details to include"

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

[tor-commits] [webwml/master] Change title of metrics job post

2018-11-15 Thread hiro

commit 82b2bb5c0b3cc5e0f49593c50050cb2b67be2281
Author: hiro 
Date:   Mon Nov 12 14:14:14 2018 +0100

Change title of metrics job post
---
 about/en/jobs-metrics-data-architect.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/jobs-metrics-data-architect.wml 
b/about/en/jobs-metrics-data-architect.wml
index ee94d104..59307f0d 100644
--- a/about/en/jobs-metrics-data-architect.wml
+++ b/about/en/jobs-metrics-data-architect.wml
@@ -1,4 +1,4 @@
-#include "head.wmi" TITLE="Tor Project: Jobs (software developer)" 
CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor Project: Jobs (metrics data architect)" 
CHARSET="UTF-8"
 
   
 Home  



___
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

2018-11-15 Thread translation

commit bd8bfd5e3dc64c7a512bb7d45ea9e3393f78f647
Author: Translation commit bot 
Date:   Thu Nov 15 16:50:08 2018 +

Update translations for tor-launcher-network-settings
---
 ur/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/network-settings.dtd b/ur/network-settings.dtd
index debbd66c5..eeb35c3d7 100644
--- a/ur/network-settings.dtd
+++ b/ur/network-settings.dtd
@@ -23,7 +23,7 @@
 
 
 
-
+
 
 
 

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

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

2018-11-15 Thread translation

commit 5e680dd623a5003548cc6ada509b17184e9d7aa3
Author: Translation commit bot 
Date:   Thu Nov 15 16:49:46 2018 +

Update translations for torcheck
---
 ur/torcheck.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ur/torcheck.po b/ur/torcheck.po
index b33543214..55b7e748b 100644
--- a/ur/torcheck.po
+++ b/ur/torcheck.po
@@ -6,10 +6,10 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 19:57+\n"
-"Last-Translator: Muhammad Sohaib Raza \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr ""
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr ""
+msgstr "The Tor Project is a US 501(c)(3)  Ø¢Ù ÙØ§Ø¦Ù ÙØ§Ù Ø¸Ø§ÛØ± ÙÛ 
Ú©Ø±ÙÛ Ø§ÙØ± Ø±Ø§Ø²Ø¯Ø§Ø±Û Ú©Û ØªØÙÛÙØ ØªØ±ÙÛØ Ø§ÙØ± ØªØ¹ÙÛÙ 
Ú©Û ÙØ¦Û ÙÙÙ Ø§ÛÚ© ØºÛØ± ÙÙØ§ÙØ¹ Ø¨Ø®Ø´ Ø§Ø¯Ø§Ø±Û ÛÛÛ"
 
 msgid "Learn More "
 msgstr ""
@@ -80,7 +80,7 @@ msgid "Short User Manual"
 msgstr ""
 
 msgid "Donate to Support Tor"
-msgstr ""
+msgstr "Ù¹ÙØ± Ú©Û ØÙØ§ÛØª ÙÛÚº Ø¹Ø·ÛÛ Ø¯ÛØ¬ÛÛ"
 
 msgid "Tor Q Site"
 msgstr ""

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

[tor-commits] [webwml/master] Add latest press clips (#28341)

2018-11-15 Thread hiro

commit 78d91b814994413506469765d491933161a5
Author: traumschule 
Date:   Tue Nov 6 07:54:02 2018 +0100

Add latest press clips (#28341)
---
 press/en/press.wml | 57 ++
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/press/en/press.wml b/press/en/press.wml
index 22800431..717e0a8f 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -51,10 +51,45 @@ some of the significant Tor-related stories that have 
popped up.
 
 
 
-2018 Sep 10
-ThreatPost
-https://threatpost.com/tor-brings-onion-browser-to-android-devices/137325/;>
-Tor Brings Browser to Android Devices
+2018 Nov 02
+Motherboard
+
+Old School 'Sniffing' Attacks Can Still Reveal Your Browsing History
+
+
+
+2018 Oct 24
+TechCrunch
+
+Mozilla is matching all donations to the Tor Project
+
+
+
+2018 Oct 23
+ZDNet
+
+Only seven of 45 browsers block TLS Session Resumption tracking
+
+
+
+2018 Oct 09
+Fossbytes
+
+10 Best Google Chrome Alternatives
+
+
+
+2018 Sep 16
+Popular Science
+
+Ditch your phone's built-in web browser for these seven alternatives
+
+
+
+2018 Sep 14
+Lifehacker Australia
+
+What You Need to Know About Tor Browser 
 
 
 
@@ -65,6 +100,13 @@ Anonym Tor Browser er - nÃ_sten - klar til Android
 
 
 
+2018 Sep 10
+ThreatPost
+https://threatpost.com/tor-brings-onion-browser-to-android-devices/137325/;>
+Tor Brings Browser to Android Devices
+
+
+
 2018 Sep 08
 Gizmodo
 http://www.gizmodo.co.uk/2018/09/the-tor-web-browser-officially-lands-on-android-in-alpha/;>
@@ -73,6 +115,13 @@ The Tor Web Browser Officially Lands on Android in 
Alpha
 
 
 2018 Sep 07
+TechCrunch
+
+Tor Project launches official mobile browser for Android 
+
+
+
+2018 Sep 07
 CyberScoop
 https://www.cyberscoop.com/adware-doctor-mac-os-china/;>
 Tor launches official anonymous Android browser



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

[tor-commits] [webwml/master] press.pl: sort publications by date

2018-11-15 Thread hiro

commit 5031a9ee5ed731d3ef64f83dd5dd434288dcce6e
Author: traumschule 
Date:   Tue Oct 30 01:22:14 2018 +0100

press.pl: sort publications by date
---
 press/press.pl | 46 +++---
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/press/press.pl b/press/press.pl
index d0c16a9e..914edcee 100755
--- a/press/press.pl
+++ b/press/press.pl
@@ -1,50 +1,29 @@
 #!/usr/bin/env perl
 # Returns html rows based on csv lines
-# Usage: /path/to/script /path/to/csv/file > file
 use strict;
 use warnings;
+use Time::Piece;
 #use HTML::Escape qw/escape_html/;
 
-my $str; # append all strings here
+my %pub; # save all publications
 
-sub print_rows {
-  my $string = shift;
-
-  # define where to output to:
-  #  1) STDOUT
-  print "$string";
-
-  #  2) press.html
-  #open my $out, '>>', 'press.html';
-  #print $out $string;
-  #  3) escaped htmlfile (install module above: cpan -i HTML::Escape
-  #print $out escape_html($string);
-  #close $out;
-}
-sub add_row {
-  $str .= shift;
-}
 sub parse_line {
   my $str = shift;
   if ($str =~ /(\d+\/\d+\/\d+),([^,]+),(.+),(.+)/) { # magic regex :)
-  chomp(my $date = qx/LANG=en_US.UTF-8 date -d "$1" "+%Y %B %d"/);
+  my $time = Time::Piece->strptime($1, "%m/%d/%y"); # given format: 
MM/DD/YY
+  my $date = $time->strftime("%Y %b %d");
   chomp(my $source = $2);
-  my $name = $3;
-  my $url = $4;
-  my $string = "
-
-$date
-$source
-$name
-
-";
-add_row $string;
+  $pub{$time->epoch} = "\n$date\n$source\n\n$3\n\n\n";
   }
 }
 
+unless (@ARGV) { print "Usage: $0 /path/to/csv/file > file\n"; exit 1; }
+
+# parse all arguments (hopefully existing files)
 foreach my $arg (@ARGV) {
   chomp($arg);
   if (-f $arg) {
+# we are lucky, this looks like a file
 open my $fh, '<', $arg
   or warn "Can't open '$arg': $!\n" and next;
 foreach (<$fh>) {
@@ -52,8 +31,13 @@ foreach my $arg (@ARGV) {
 }
 close $fh;
   } else {
+# this is no file, let's assume we got piped a string to parse
 parse_line $arg;
   }
 }
-if ($str) { print_rows $str; }
+
+# share our treasure with the world
+my $str = join '', map { $pub{$_} } reverse sort keys %pub;
+if ($str) { print $str; }
 else { print "Nothing found.\n"; exit 1; }
+# TODO one day i want to able to update press/en/press.wml directly



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

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2018-11-15 Thread translation

commit 1febe2e485f8ac02b7aecf90c1890fb73c83cd0c
Author: Translation commit bot 
Date:   Thu Nov 15 17:17:39 2018 +

Update translations for tor-and-https_completed
---
 ko.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko.po b/ko.po
index 6d2ff2bd2..f0c508d35 100644
--- a/ko.po
+++ b/ko.po
@@ -4,10 +4,10 @@
 # Sam Ryoo , 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2018-04-12 19:08+\n"
-"Last-Translator: SEPT \n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2018-11-15 Thread translation

commit 1d3c80a0289e4c5bec97fa74fc4b0fabe9e21b43
Author: Translation commit bot 
Date:   Thu Nov 15 17:17:00 2018 +

Update translations for tails-openpgp-applet_completed
---
 ko/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/openpgp-applet.pot b/ko/openpgp-applet.pot
index e08f2f44c..d6a625fdb 100644
--- a/ko/openpgp-applet.pot
+++ b/ko/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-10-04 00:31+\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\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/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-15 Thread translation

commit c84fa25a3bebefff30afa8e2ffc33de19d962d0a
Author: Translation commit bot 
Date:   Thu Nov 15 17:17:13 2018 +

Update translations for tails-persistence-setup
---
 ko/ko.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index c16c7fbeb..54390ddb2 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-10-04 00:31+\n"
+"POT-Creation-Date: 2018-11-01 12:21+0100\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -212,65 +212,65 @@ msgstr "%sì ìêµ¬ì  ë³¼ë¥¨ì  %s %s ì 
ìì±ë©ëë¤. ì´ ë³¼ë¥¨
 msgid "Create"
 msgstr "ìì±"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:141
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:142
 msgid ""
 "Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:169
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:170
 msgid "Passphrase:"
 msgstr "ìí¸ :"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:177
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:178
 msgid "Verify Passphrase:"
 msgstr "ìí¸ íì¸ :"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:188
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:244
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:189
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:245
 msgid "Passphrase can't be empty"
 msgstr "ìí¸ë ë¹ì ë ì ììµëë¤"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:235
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:236
 msgid "Passphrases do not match"
 msgstr "ìí¸ê° ì¼ì¹íì§ ììµëë¤"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:284
 #: ../lib/Tails/Persistence/Step/Delete.pm:103
 #: ../lib/Tails/Persistence/Step/Configure.pm:181
 msgid "Failed"
 msgstr "ì¤í¨"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:291
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:292
 msgid "Mounting Tails persistence partition."
 msgstr "Tails ìêµ¬ íí°ìì ë§ì´í¸ ì¤"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:294
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "The Tails persistence partition will be mounted."
 msgstr "Tails ìêµ¬ íí°ìì´ ë§ì´í¸ë©ëë¤."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:303
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304
 msgid "Correcting permissions of the persistent volume."
 msgstr "ìêµ¬ì  ë³¼ë¥¨ì ê¶í ìì "
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:306
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307
 msgid "The permissions of the persistent volume will be corrected."
 msgstr "ìêµ¬ì  ë³¼ë¥¨ì ê¶íì ìì ë©ëë¤."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:314
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:315
 msgid "Creating default persistence configuration."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:317
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:318
 msgid "The default persistence configuration will be created."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:333
 msgid "Creating..."
 msgstr "ìì±ì¤..."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:336
 msgid "Creating the persistent volume..."
 msgstr "ìêµ¬ ë³¼ë¥¨ì ìì± ì¤ ..."
 

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2018-11-15 Thread translation

commit 13d1fd0b6882847984f28f4c35a339261dbf2370
Author: Translation commit bot 
Date:   Thu Nov 15 17:17:33 2018 +

Update translations for tor-and-https
---
 ko.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko.po b/ko.po
index 6d2ff2bd2..f0c508d35 100644
--- a/ko.po
+++ b/ko.po
@@ -4,10 +4,10 @@
 # Sam Ryoo , 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2018-04-12 19:08+\n"
-"Last-Translator: SEPT \n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-15 Thread translation

commit 200663173dc18ce395732774f2fafae90dd50c05
Author: Translation commit bot 
Date:   Thu Nov 15 17:17:24 2018 +

Update translations for tba-android_stringsdtd
---
 ko/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/android_strings.dtd b/ko/android_strings.dtd
index a1066d640..ba4ab7c17 100644
--- a/ko/android_strings.dtd
+++ b/ko/android_strings.dtd
@@ -452,7 +452,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2018-11-15 Thread translation

commit 406121ca77cd7cc2fc06357fe54d1d8fe716
Author: Translation commit bot 
Date:   Thu Nov 15 16:47:42 2018 +

Update translations for tor-and-https
---
 ur.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ur.po b/ur.po
index f3ae52ec6..b014ff3af 100644
--- a/ur.po
+++ b/ur.po
@@ -3,10 +3,10 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2017-09-20 03:03+\n"
-"Last-Translator: Muhammad Sohaib Raza \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: C/tor-and-https.svg:14
 #, no-wrap
 msgid "Tor and HTTPS"
-msgstr ""
+msgstr "Ù¹ÙØ± Ø§ÙØ± Ø§ÛÚ Ù¹Û Ù¹Û Ù¾Û Ø§ÛØ³"
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".

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

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

2018-11-15 Thread translation

commit 8cd5b9559290fe2d74ef8b255b7fd1c2a27af191
Author: Translation commit bot 
Date:   Thu Nov 15 16:48:23 2018 +

Update translations for torbutton-brandproperties
---
 ur/brand.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ur/brand.properties b/ur/brand.properties
index 732c15741..b50f00370 100644
--- a/ur/brand.properties
+++ b/ur/brand.properties
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor Browser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Ù¹Ø§Ø± Ø¨Ø±Ø§Ø¤Ø²Ø±
+brandShortName=Ù¹Ø§Ø± Ø¨Ø±Ø§Ø¤Ø²Ø±
+brandFullName=Ù¹Ø§Ø± Ø¨Ø±Ø§Ø¤Ø²Ø±
+vendorShortName=Ù¹Ø§Ø± Ù¾Ø±Ø§Ø¬Ú©Ù¹
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S

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

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

2018-11-15 Thread translation

commit b5c4c5d007b5b5328c05409b0166f01cd0916aad
Author: Translation commit bot 
Date:   Thu Nov 15 16:48:36 2018 +

Update translations for torbutton-branddtd
---
 ur/brand.dtd | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ur/brand.dtd b/ur/brand.dtd
index 3df1a084c..1a6275d13 100644
--- a/ur/brand.dtd
+++ b/ur/brand.dtd
@@ -2,14 +2,15 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
-
-
+
+
+
+
+
 
 
-
-
-
-
+
+
+
+

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

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

2018-11-15 Thread translation

commit 5aa4135c8446923d73e2cc797c22751f4e460226
Author: Translation commit bot 
Date:   Thu Nov 15 16:48:02 2018 +

Update translations for torbirdy
---
 ur/torbirdy.dtd|  2 +-
 ur/torbirdy.properties | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ur/torbirdy.dtd b/ur/torbirdy.dtd
index 776433488..5b71bf9b3 100644
--- a/ur/torbirdy.dtd
+++ b/ur/torbirdy.dtd
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 
diff --git a/ur/torbirdy.properties b/ur/torbirdy.properties
index 0bc5db689..4c9b79ef8 100644
--- a/ur/torbirdy.properties
+++ b/ur/torbirdy.properties
@@ -1,11 +1,11 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy Enabled:Tor
-torbirdy.enabled.jondo=TorBirdy Enabled:JonDo
-torbirdy.enabled.custom=TorBirdy Enabled:Custom Proxy
-torbirdy.enabled.torification=TorBirdy Enabled:Transparent Torification
-torbirdy.enabled.whonix=TorBirdy Enabled:Whonix
-torbirdy.disabled=TorBirdy:Disabled!
+torbirdy.enabled.tor=TorBirdy ÙØ¹Ø§Ù : Ù¹Ø§Ø±
+torbirdy.enabled.jondo=TorBirdy ÙØ¹Ø§Ù : JonDo
+torbirdy.enabled.custom=TorBirdy ÙØ¹Ø§Ù : Ú©Ø³Ù¹Ù Ù¾Ø±Ø§Ú©Ø³Û
+torbirdy.enabled.torification=TorBirdy ÙØ¹Ø§Ù : Ù¹Ø±Ø§ÙØ³Ù¾ÙØ±Ù¹ 
Ù¹Ø§Ø±ÛÙÛÚ©ÛØ´Ù
+torbirdy.enabled.whonix=TorBirdy ÙØ¹Ø§Ù : Whonix
+torbirdy.disabled=TorBirdy : ØºÛØ± ÙØ¹Ø§Ù
 torbirdy.enabled=TorBirdy:Enabled
 
 torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration 
wizard to protect your anonymity.\n\nThe recommended security settings for %S 
have been set.\n\nYou can now configure the other account settings manually.

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-11-15 Thread translation

commit a7504bf161d048d2857b2d5fe41ac62d3c3fce1f
Author: Translation commit bot 
Date:   Thu Nov 15 17:15:58 2018 +

Update translations for liveusb-creator
---
 ko/ko.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index e8e4d7bb4..ed1fb197d 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -87,194 +87,194 @@ msgstr "%(infile)së¥¼ %(outfile)sì ë³µì¬ í  ì 
ììµëë¤ : %(message)s"
 msgid "Removing existing Live OS"
 msgstr "ê¸°ì¡´ LiveOSì ìì  ì¤"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "%(file)së¥¼ chmodí  ì ììµëë¤: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "ì´ì  LiveOSìì íì¼ì ìì í  ì ììµëë¤ : %(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "ì´ì  LiveOSìì ëë í ë¦¬ë¥¼ ìì í  ì ììµëë¤ : 
%(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "%s ì¥ì¹ë¥¼ ì°¾ì ì ìì "
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)sì ì¸ ì ììµëë¤. ì¤íµí©ëë¤."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "ëì ì¥ì¹ %(device)s íí°ìì ì¼ë¶ê° 
ë§ì´í¸ëììµëë¤. ì¤ì¹ íë¡ì¸ì¤ê° ììíê¸° ì ì ì´ë¤ì 
ë§ì´í¸ í´ì ë©ëë¤."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "ì ììë íì¼ ìì¤í. ì¥ì¹ë¥¼ ë¤ì í¬ë§·í´ì¼í ì§ë 
ëª¨ë¦ëë¤."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ì§ìëì§ ìë íì¼ ìì¤í: %s "
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ì¥ì¹ë¥¼ íì¬íë ëì ì ì ìë GLib ìì¸ê° 
ë°ìíìµëë¤:%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ì¥ì¹ë¥¼ ë§ì´í¸ í  ì ììµëë¤: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "ë§ì´í¸ í¬ì¸í¸ë¥¼ ì°¾ì ì ììµëë¤."
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s'ì unmount_deviceë¥¼ ìë ¥ ì¤"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)sì ë§ì´í¸ ë íì¼ ìì¤íì ë§ì´í¸ í´ì  ì¤"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)sì '%(udi)s'ë¥¼ ë¶ë¦¬ ì¤"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "ë§ì´í¸ í´ì  í %sì ì¤ì²´ë¥¼ ë§ì´í¸"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "ì¥ì¹ %(device)sì íí°ìì êµ¬ì± ì¤"
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "ì§ìëì§ ìë ì¥ì¹ '%(device)s', ë²ê·¸ë¥¼ ë³´ê³

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

2018-11-15 Thread translation

commit c22eb27cedd5ee919cf4662b68b3b438a57f65ba
Author: Translation commit bot 
Date:   Thu Nov 15 17:16:27 2018 +

Update translations for tails-iuk
---
 ko.po | 94 +--
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/ko.po b/ko.po
index 2bdf9ec70..a00d74b59 100644
--- a/ko.po
+++ b/ko.po
@@ -10,11 +10,11 @@
 # Sangmin Lee , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-04-12 19:08+\n"
-"Last-Translator: Plusb Preco \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,18 +22,18 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "ì ë³´ë¥¼ ëë²ê¹ íê¸° ìí´ì  ë¤ì ëªë ¹ì´ë¥¼ ì¤í 
íì¸ì: sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "ìë°ì´í¸ ì ê² ì¤ ì¤ë¥ ë°ì"
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -42,64 +42,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Tor ì¹ ì¬ì´í¸ìì ìë°ì´í¸ë¥¼ íì¸ í  ìê° 
ììµëë¤.\n\në¤í¸ìí¬ ì°ê²°ì íì¸íê³ , Tailì ë¤ì 
ììí í ìë°ì´í¸ë¥¼ íì¸í´ ì£¼ì¸ì.\n\në¬¸ì ê° ê³ì ë°ìí 
 ê²½ì° file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html ë¡ 
ì ìíì¸ì."
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "ì´ ë²ì ì ëí´ ì¹ ì¬ì´í¸ìì ì¬ì©í  ì ìë ìë 
ìê·¸ë ì´ëë ììµëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
 msgstr "ë¹ì ì ì¥ì¹ë Tails ì¤ì¹ íë¡ê·¸ë¨ì ì¬ì©íì¬ 
ìì±ëì§ ìììµëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tailsë DVD ëë ì½ê¸° ì ì© ì¥ì¹ìì ë¶ííììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "Tails ìì¤í íí°ìì ì¶©ë¶í ê³µê°ì´ ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "ì¶©ë¶í ë©ëª¨ë¦¬ê° ì´ ìì¤íìì ì¬ì©í  ì ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "ì´ì  '%{reason}s'ì ëí ì¤ëªì ì¬ì©í  ì ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "ìì¤íì´ ìµì  ë²ì ìëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "íì¬ Tailsê° ìë  ë²ì ì´ë¼ ë³´ììì ìíì´ ìì ì 
ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr " Tails ì íìí ìë°ì´í¸ë¥¼ íë ë° %{space_needed}s ì 
íí°ì ê³µê°ì´ íìí©ëë¤. íì¬ ìí : %{free_space}s ì ë 
ê³µê° ìì"
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:334
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr "ìë°ì´í¸ë¥¼ íë ë° %{space_needed}s ì ë©ëª¨ë¦¬ ê³µê°ì´ 
íìí©ëë¤. íì¬ ìí : %{free_space}s ì ë ê³µê° ìì"
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:356
 msgid ""
 "An incremental upgrade is available, but no full upgrade

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

2018-11-15 Thread translation

commit a1f4dc5e78ae4455358179b377e1fae5c17bf6ca
Author: Translation commit bot 
Date:   Thu Nov 15 17:16:18 2018 +

Update translations for tails-misc
---
 ko.po | 90 +--
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/ko.po b/ko.po
index 672d5cf97..95a2c186f 100644
--- a/ko.po
+++ b/ko.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 14:43+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-10-31 16:04+0100\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -150,91 +150,91 @@ msgstr "ìì± ì ë³´:\n%s"
 msgid "not available"
 msgstr "ë¶ê°ë¥"
 
-#. Translators: Don't translate {details}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
 #, python-brace-format
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Show Log"
 msgstr "ë¡ê·¸ ë³´ê¸°"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Configure"
 msgstr "êµ¬ì±"
 
-#. Translators: Don't translate {beginning} or {last}, they are placeholders
-#. and will be replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222
 #, python-brace-format
 msgid "{beginning} and {last}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
 msgid ", "
 msgstr ""
 
-#. Translators: Don't translate {packages}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
 #, python-brace-format
 msgid "Add {packages} to your additional software?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293
 msgid "Install Every Time"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Install Only Once"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371
 msgid "The configuration of your additional software failed."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321
 msgid ""
 "To install it automatically when starting Tails, you can create a persistent"
 " storage and activate the Additional Software feature."

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2018-11-15 Thread translation

commit 25c8c48e300538a7fc23b6f325ea390aa3de01a4
Author: Translation commit bot 
Date:   Thu Nov 15 17:16:04 2018 +

Update translations for liveusb-creator_completed
---
 ko/ko.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index e8e4d7bb4..ed1fb197d 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -87,194 +87,194 @@ msgstr "%(infile)së¥¼ %(outfile)sì ë³µì¬ í  ì 
ììµëë¤ : %(message)s"
 msgid "Removing existing Live OS"
 msgstr "ê¸°ì¡´ LiveOSì ìì  ì¤"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "%(file)së¥¼ chmodí  ì ììµëë¤: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "ì´ì  LiveOSìì íì¼ì ìì í  ì ììµëë¤ : %(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "ì´ì  LiveOSìì ëë í ë¦¬ë¥¼ ìì í  ì ììµëë¤ : 
%(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "%s ì¥ì¹ë¥¼ ì°¾ì ì ìì "
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)sì ì¸ ì ììµëë¤. ì¤íµí©ëë¤."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "ëì ì¥ì¹ %(device)s íí°ìì ì¼ë¶ê° 
ë§ì´í¸ëììµëë¤. ì¤ì¹ íë¡ì¸ì¤ê° ììíê¸° ì ì ì´ë¤ì 
ë§ì´í¸ í´ì ë©ëë¤."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "ì ììë íì¼ ìì¤í. ì¥ì¹ë¥¼ ë¤ì í¬ë§·í´ì¼í ì§ë 
ëª¨ë¦ëë¤."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ì§ìëì§ ìë íì¼ ìì¤í: %s "
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ì¥ì¹ë¥¼ íì¬íë ëì ì ì ìë GLib ìì¸ê° 
ë°ìíìµëë¤:%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ì¥ì¹ë¥¼ ë§ì´í¸ í  ì ììµëë¤: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "ë§ì´í¸ í¬ì¸í¸ë¥¼ ì°¾ì ì ììµëë¤."
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s'ì unmount_deviceë¥¼ ìë ¥ ì¤"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)sì ë§ì´í¸ ë íì¼ ìì¤íì ë§ì´í¸ í´ì  ì¤"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)sì '%(udi)s'ë¥¼ ë¶ë¦¬ ì¤"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "ë§ì´í¸ í´ì  í %sì ì¤ì²´ë¥¼ ë§ì´í¸"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "ì¥ì¹ %(device)sì íí°ìì êµ¬ì± ì¤"
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "ì§ìëì§ ìë ì¥ì¹ '%(device)s', ë²ê·¸ë¥¼ ë³´ê³

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

2018-11-15 Thread translation

commit d1f4675980d0dca4d8115344aad8b80e4a02f5cc
Author: Translation commit bot 
Date:   Thu Nov 15 17:16:32 2018 +

Update translations for tails-iuk_completed
---
 ko.po | 94 +--
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/ko.po b/ko.po
index 2bdf9ec70..a00d74b59 100644
--- a/ko.po
+++ b/ko.po
@@ -10,11 +10,11 @@
 # Sangmin Lee , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-04-12 19:08+\n"
-"Last-Translator: Plusb Preco \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,18 +22,18 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "ì ë³´ë¥¼ ëë²ê¹ íê¸° ìí´ì  ë¤ì ëªë ¹ì´ë¥¼ ì¤í 
íì¸ì: sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "ìë°ì´í¸ ì ê² ì¤ ì¤ë¥ ë°ì"
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -42,64 +42,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Tor ì¹ ì¬ì´í¸ìì ìë°ì´í¸ë¥¼ íì¸ í  ìê° 
ììµëë¤.\n\në¤í¸ìí¬ ì°ê²°ì íì¸íê³ , Tailì ë¤ì 
ììí í ìë°ì´í¸ë¥¼ íì¸í´ ì£¼ì¸ì.\n\në¬¸ì ê° ê³ì ë°ìí 
 ê²½ì° file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html ë¡ 
ì ìíì¸ì."
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "ì´ ë²ì ì ëí´ ì¹ ì¬ì´í¸ìì ì¬ì©í  ì ìë ìë 
ìê·¸ë ì´ëë ììµëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
 msgstr "ë¹ì ì ì¥ì¹ë Tails ì¤ì¹ íë¡ê·¸ë¨ì ì¬ì©íì¬ 
ìì±ëì§ ìììµëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tailsë DVD ëë ì½ê¸° ì ì© ì¥ì¹ìì ë¶ííììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "Tails ìì¤í íí°ìì ì¶©ë¶í ê³µê°ì´ ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "ì¶©ë¶í ë©ëª¨ë¦¬ê° ì´ ìì¤íìì ì¬ì©í  ì ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "ì´ì  '%{reason}s'ì ëí ì¤ëªì ì¬ì©í  ì ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "ìì¤íì´ ìµì  ë²ì ìëë¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "íì¬ Tailsê° ìë  ë²ì ì´ë¼ ë³´ììì ìíì´ ìì ì 
ììµëë¤."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr " Tails ì íìí ìë°ì´í¸ë¥¼ íë ë° %{space_needed}s ì 
íí°ì ê³µê°ì´ íìí©ëë¤. íì¬ ìí : %{free_space}s ì ë 
ê³µê° ìì"
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:334
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr "ìë°ì´í¸ë¥¼ íë ë° %{space_needed}s ì ë©ëª¨ë¦¬ ê³µê°ì´ 
íìí©ëë¤. íì¬ ìí : %{free_space}s ì ë ê³µê° ìì"
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:356
 msgid ""
 "An incremental upgrade is available, but no

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2018-11-15 Thread translation

commit 807386734b39adf84c91ecc1e06600d655b8dd6a
Author: Translation commit bot 
Date:   Thu Nov 15 17:16:54 2018 +

Update translations for tails-openpgp-applet
---
 ko/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/openpgp-applet.pot b/ko/openpgp-applet.pot
index e08f2f44c..d6a625fdb 100644
--- a/ko/openpgp-applet.pot
+++ b/ko/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-10-04 00:31+\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\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] [webwml/master] Add nighat to board

2018-11-15 Thread hiro

commit 77df8167fdad650434abf076c123b2b88ff71258
Author: hiro 
Date:   Thu Nov 15 17:55:27 2018 +0100

Add nighat to board
---
 about/en/board.wml | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 5a981db6..6bdad4f6 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -47,6 +47,25 @@
   
   
 
+  Nighat Dad
+  Director
+  
+Nighat is the founder and Executive Director of the Digital Rights
+Foundation, Pakistan. She is an accomplished lawyer and human 
rights
+activist. Nighat is a pioneer for access to a safe and open 
Internet
+in Pakistan and globally. She was a TED Global Fellow for 2017, was
+listed as one of TIME magazine's Next Generation Leaders in 2015,
+and was the recipient of the Atlantic Council Freedom Award and
+Human Rights Tulip Award. Nighat was also the only Pakistani
+selected as a Young Global Leader by the World Economic Forum in
+2018. Recently her organization, the Digital Rights Foundation, was
+named among the 10 best social entrepreneurs at the United Nations
+General Assembly 2018 meeting by Forbes magazine.
+  
+
+  
+  
+
   Megan Price
   Director
   
@@ -104,7 +123,7 @@
   Ramy Raoof
   Director
   
-Ramy is a technologist and privacy and security researcher with a 
passion for free/open culture. He has provided and developed digital security 
plans and strategies for NGOs and members of the media, emergency response in 
cases of physical threats, support on publishing sensitive materials, secure 
systems for managing sensitive information, and operational plans for human 
rights emergency response teams, in Egypt and the MENA region. Most recently, 
Ramy has been volunteering with different NGOs and civil liberty groups in 
Central & South America, to enhance their privacy and security through means of 
behavioral change based on understanding surveillance and threat models in 
their own contexts and environments. Among different hats, Ramy is Senior 
Research Technologist at the Egyptian Initiative for Personal Rights (EIPR), 
Research Fellow with Citizen Lab, and currently a volunteer visitor with 
FundaciÃ³n Acceso assisting collectives and networks in Central America around
  infosec and activism. He is also an Internet Freedom Festival Fellow on 
security and privacy best practices. Ramy has received multiple international 
awards for his important work. Most recently, Ramy received the 2017 Heroes of 
Human Rights and Communications Surveillance from Access Now. 
+Ramy is a technologist and privacy and security researcher with a 
passion for free/open culture. He has provided and developed digital security 
plans and strategies for NGOs and members of the media, emergency response in 
cases of physical threats, support on publishing sensitive materials, secure 
systems for managing sensitive information, and operational plans for human 
rights emergency response teams, in Egypt and the MENA region. Most recently, 
Ramy has been volunteering with different NGOs and civil liberty groups in 
Central & South America, to enhance their privacy and security through means of 
behavioral change based on understanding surveillance and threat models in 
their own contexts and environments. Among different hats, Ramy is Senior 
Research Technologist at the Egyptian Initiative for Personal Rights (EIPR), 
Research Fellow with Citizen Lab, and currently a volunteer visitor with 
FundaciÃ³n Acceso assisting collectives and networks in Central America around
  infosec and activism. He is also an Internet Freedom Festival Fellow on 
security and privacy best practices. Ramy has received multiple international 
awards for his important work. Most recently, Ramy received the 2017 Heroes of 
Human Rights and Communications Surveillance from Access Now.
   
 
   
@@ -113,7 +132,7 @@
   Julius Mittenzwei
   Director
   
-Julius is a lawyer and internet activist with 19 years of 
leadership experience as an Executive Director and entrepreneur in the 
publishing industry. He is a longtime Tor advocate with a background in the 
Free Software movement and member of the Chaos Computer Club (CCC), one of the 
oldest hacker collectives in the world. Along with CCC, he has been running Tor 
nodes since 2005. As a lawyer, he has represented several Tor exit node 
operators accused of abuse. He holds a PhD in Copyright Law from LMU Munich. 
+Julius is a lawyer and internet activist with 19 years of 
leadership experience as an Executive Director and entrepreneur in the 
publishing industry. He is a longtime Tor advocate with a background in the 
Free Software

[tor-commits] [tor/maint-0.3.4] Appveyor: add comments to the config file

2018-11-15 Thread nickm

commit 27b91704753ae3235630b298449b4c8a107bd107
Author: teor 
Date:   Thu Nov 15 18:57:39 2018 +1000

Appveyor: add comments to the config file

Documentation for 28399, 28454, and previous fixes.
---
 .appveyor.yml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index c288ad812..f76a9f0a9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
 mingw_prefix: mingw-w64-x86_64
+# hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
 hardening: --disable-gcc-hardening
 
 install:
@@ -28,11 +29,17 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
+<# mingw packages start with ${env:mingw_prefix}
+ # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+ #
+ # Use pacman --debug to show package downloads and install locations
+ #>
 Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler and user binaries to build and install #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin", 
"C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
@@ -43,6 +50,10 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
+<# compile for mingw
+ # mingw zstd doesn't come with a pkg-config file, so we manually
+ # configure its flags. liblzma just works.
+ #>
 Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
@@ -51,6 +62,7 @@ build_script:
 test_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler binaries to make check #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
 $env:Path = $buildpath -join ';'
@@ -61,14 +73,17 @@ test_script:
 on_failure:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 user binaries to archive failures #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
 Set-Location "${env:build}"
+<# store logs as appveyor artifacts: see the artifacts tab #>
 Execute-Bash "7z a logs.zip config.log || true"
 Execute-Bash "7z a logs.zip test-suite.log || true"
 Execute-Bash "appveyor PushArtifact logs.zip || true"
 Execute-Bash "tail -1000 config.log || true"
 Execute-Bash "cat test-suite.log || true"
 }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-15 Thread nickm

commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1
Merge: d598d834f 27b917047
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Appveyor: Improve diagnostics

2018-11-15 Thread nickm

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372
Author: teor 
Date:   Thu Nov 15 13:43:20 2018 +1000

Appveyor: Improve diagnostics

Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..4069a5396 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
-Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm 
openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent 
${env:mingw_prefix}-zstd ;
+Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2018-11-15 Thread nickm

commit 09c5f75aaf9a76be065409e4aeea7a465ebb728b
Merge: 962db831c a9db07f32
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] Appveyor: add comments to the config file

2018-11-15 Thread nickm

commit 27b91704753ae3235630b298449b4c8a107bd107
Author: teor 
Date:   Thu Nov 15 18:57:39 2018 +1000

Appveyor: add comments to the config file

Documentation for 28399, 28454, and previous fixes.
---
 .appveyor.yml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index c288ad812..f76a9f0a9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
 mingw_prefix: mingw-w64-x86_64
+# hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
 hardening: --disable-gcc-hardening
 
 install:
@@ -28,11 +29,17 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
+<# mingw packages start with ${env:mingw_prefix}
+ # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+ #
+ # Use pacman --debug to show package downloads and install locations
+ #>
 Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler and user binaries to build and install #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin", 
"C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
@@ -43,6 +50,10 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
+<# compile for mingw
+ # mingw zstd doesn't come with a pkg-config file, so we manually
+ # configure its flags. liblzma just works.
+ #>
 Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
@@ -51,6 +62,7 @@ build_script:
 test_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler binaries to make check #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
 $env:Path = $buildpath -join ';'
@@ -61,14 +73,17 @@ test_script:
 on_failure:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 user binaries to archive failures #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
 Set-Location "${env:build}"
+<# store logs as appveyor artifacts: see the artifacts tab #>
 Execute-Bash "7z a logs.zip config.log || true"
 Execute-Bash "7z a logs.zip test-suite.log || true"
 Execute-Bash "appveyor PushArtifact logs.zip || true"
 Execute-Bash "tail -1000 config.log || true"
 Execute-Bash "cat test-suite.log || true"
 }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure



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

[tor-commits] [tor/master] Appveyor: remove incorrect OpenSSL path

2018-11-15 Thread nickm

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor 
Date:   Thu Nov 15 14:32:53 2018 +1000

Appveyor: remove incorrect OpenSSL path

Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml| 4 +---
 changes/bug28399 | 4 
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
 compiler_path: mingw32
-openssl_path: /c/OpenSSL-Win32
 mingw_prefix: mingw-w64-i686
 hardening:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
-openssl_path: /c/OpenSSL-Win64
 mingw_prefix: mingw-w64-x86_64
 hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 0..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Stop using an external OpenSSL install, and stop installing MSYS2
+  packages, when building using mingw on Appveyor Windows CI.
+  Fixes bug 28399; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/master] Appveyor: manually add zstd flags to configure

2018-11-15 Thread nickm

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed
Author: teor 
Date:   Thu Nov 15 18:32:52 2018 +1000

Appveyor: manually add zstd flags to configure

The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
---
 .appveyor.yml| 2 +-
 changes/bug28454 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fdf831686..c288ad812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28454 b/changes/bug28454
new file mode 100644
index 0..ca46ae277
--- /dev/null
+++ b/changes/bug28454
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Manually configure the zstd compiler options, when building using
+  mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+  come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/maint-0.3.5] Appveyor: Improve diagnostics

2018-11-15 Thread nickm

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372
Author: teor 
Date:   Thu Nov 15 13:43:20 2018 +1000

Appveyor: Improve diagnostics

Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..4069a5396 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
-Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm 
openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent 
${env:mingw_prefix}-zstd ;
+Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-



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

[tor-commits] [tor/maint-0.3.5] Appveyor: remove incorrect OpenSSL path

2018-11-15 Thread nickm

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor 
Date:   Thu Nov 15 14:32:53 2018 +1000

Appveyor: remove incorrect OpenSSL path

Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml| 4 +---
 changes/bug28399 | 4 
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
 compiler_path: mingw32
-openssl_path: /c/OpenSSL-Win32
 mingw_prefix: mingw-w64-i686
 hardening:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
-openssl_path: /c/OpenSSL-Win64
 mingw_prefix: mingw-w64-x86_64
 hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 0..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Stop using an external OpenSSL install, and stop installing MSYS2
+  packages, when building using mingw on Appveyor Windows CI.
+  Fixes bug 28399; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/maint-0.3.5] Appveyor: add comments to the config file

2018-11-15 Thread nickm

commit 27b91704753ae3235630b298449b4c8a107bd107
Author: teor 
Date:   Thu Nov 15 18:57:39 2018 +1000

Appveyor: add comments to the config file

Documentation for 28399, 28454, and previous fixes.
---
 .appveyor.yml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index c288ad812..f76a9f0a9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
 mingw_prefix: mingw-w64-x86_64
+# hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
 hardening: --disable-gcc-hardening
 
 install:
@@ -28,11 +29,17 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
+<# mingw packages start with ${env:mingw_prefix}
+ # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+ #
+ # Use pacman --debug to show package downloads and install locations
+ #>
 Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler and user binaries to build and install #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin", 
"C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
@@ -43,6 +50,10 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
+<# compile for mingw
+ # mingw zstd doesn't come with a pkg-config file, so we manually
+ # configure its flags. liblzma just works.
+ #>
 Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
@@ -51,6 +62,7 @@ build_script:
 test_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler binaries to make check #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
 $env:Path = $buildpath -join ';'
@@ -61,14 +73,17 @@ test_script:
 on_failure:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 user binaries to archive failures #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
 Set-Location "${env:build}"
+<# store logs as appveyor artifacts: see the artifacts tab #>
 Execute-Bash "7z a logs.zip config.log || true"
 Execute-Bash "7z a logs.zip test-suite.log || true"
 Execute-Bash "appveyor PushArtifact logs.zip || true"
 Execute-Bash "tail -1000 config.log || true"
 Execute-Bash "cat test-suite.log || true"
 }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure



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

[tor-commits] [tor/release-0.3.4] Appveyor: Improve diagnostics

2018-11-15 Thread nickm

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372
Author: teor 
Date:   Thu Nov 15 13:43:20 2018 +1000

Appveyor: Improve diagnostics

Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..4069a5396 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
-Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm 
openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent 
${env:mingw_prefix}-zstd ;
+Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-



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

[tor-commits] [tor/master] Appveyor: Improve diagnostics

2018-11-15 Thread nickm

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372
Author: teor 
Date:   Thu Nov 15 13:43:20 2018 +1000

Appveyor: Improve diagnostics

Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..4069a5396 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
-Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm 
openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent 
${env:mingw_prefix}-zstd ;
+Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-15 Thread nickm

commit 92f71b8e88c58b38c027a291066337f896ad344b
Merge: 12175987f a9db07f32
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.5'

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Appveyor: remove incorrect OpenSSL path

2018-11-15 Thread nickm

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor 
Date:   Thu Nov 15 14:32:53 2018 +1000

Appveyor: remove incorrect OpenSSL path

Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml| 4 +---
 changes/bug28399 | 4 
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
 compiler_path: mingw32
-openssl_path: /c/OpenSSL-Win32
 mingw_prefix: mingw-w64-i686
 hardening:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
-openssl_path: /c/OpenSSL-Win64
 mingw_prefix: mingw-w64-x86_64
 hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 0..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Stop using an external OpenSSL install, and stop installing MSYS2
+  packages, when building using mingw on Appveyor Windows CI.
+  Fixes bug 28399; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/release-0.3.4] Appveyor: add comments to the config file

2018-11-15 Thread nickm

commit 27b91704753ae3235630b298449b4c8a107bd107
Author: teor 
Date:   Thu Nov 15 18:57:39 2018 +1000

Appveyor: add comments to the config file

Documentation for 28399, 28454, and previous fixes.
---
 .appveyor.yml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index c288ad812..f76a9f0a9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
 mingw_prefix: mingw-w64-x86_64
+# hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
 hardening: --disable-gcc-hardening
 
 install:
@@ -28,11 +29,17 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
+<# mingw packages start with ${env:mingw_prefix}
+ # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+ #
+ # Use pacman --debug to show package downloads and install locations
+ #>
 Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler and user binaries to build and install #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin", 
"C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
@@ -43,6 +50,10 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
+<# compile for mingw
+ # mingw zstd doesn't come with a pkg-config file, so we manually
+ # configure its flags. liblzma just works.
+ #>
 Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
@@ -51,6 +62,7 @@ build_script:
 test_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler binaries to make check #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
 $env:Path = $buildpath -join ';'
@@ -61,14 +73,17 @@ test_script:
 on_failure:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 user binaries to archive failures #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
 Set-Location "${env:build}"
+<# store logs as appveyor artifacts: see the artifacts tab #>
 Execute-Bash "7z a logs.zip config.log || true"
 Execute-Bash "7z a logs.zip test-suite.log || true"
 Execute-Bash "appveyor PushArtifact logs.zip || true"
 Execute-Bash "tail -1000 config.log || true"
 Execute-Bash "cat test-suite.log || true"
 }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure



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

[tor-commits] [tor/maint-0.3.5] Appveyor: manually add zstd flags to configure

2018-11-15 Thread nickm

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed
Author: teor 
Date:   Thu Nov 15 18:32:52 2018 +1000

Appveyor: manually add zstd flags to configure

The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
---
 .appveyor.yml| 2 +-
 changes/bug28454 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fdf831686..c288ad812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28454 b/changes/bug28454
new file mode 100644
index 0..ca46ae277
--- /dev/null
+++ b/changes/bug28454
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Manually configure the zstd compiler options, when building using
+  mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+  come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.



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

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

2018-11-15 Thread translation

commit ce1c9912019fca8fe99c2e0fea6a6336a8b74a5b
Author: Translation commit bot 
Date:   Thu Nov 15 16:47:11 2018 +

Update translations for tails-onioncircuits
---
 ur/onioncircuits.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ur/onioncircuits.pot b/ur/onioncircuits.pot
index 1cf617641..4f5f3958f 100644
--- a/ur/onioncircuits.pot
+++ b/ur/onioncircuits.pot
@@ -6,11 +6,11 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2018-02-20 19:11+\n"
-"Last-Translator: Furhan Hussain \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594
 msgid "Unknown"
-msgstr ""
+msgstr "ÙØ¨Ø¹Ù"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2018-11-15 Thread translation

commit 670864bd8f1c3f8ab0ba61c191c01ce761ed974b
Author: Translation commit bot 
Date:   Thu Nov 15 16:47:00 2018 +

Update translations for tails-openpgp-applet
---
 ur/openpgp-applet.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ur/openpgp-applet.pot b/ur/openpgp-applet.pot
index 769604594..9729ff504 100644
--- a/ur/openpgp-applet.pot
+++ b/ur/openpgp-applet.pot
@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-02-20 19:11+\n"
-"Last-Translator: Furhan Hussain \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
-msgstr ""
+msgstr "_Decrypt/Verify Clipboard"
 
 #: bin/openpgp-applet:244
 msgid "_Manage Keys"

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

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

2018-11-15 Thread translation

commit c68ee26063aa2a1e7061be66dee57d3c321be370
Author: Translation commit bot 
Date:   Thu Nov 15 16:47:21 2018 +

Update translations for tails-persistence-setup
---
 ur/ur.po | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index dc51ae5d0..2eaf14221 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -7,11 +7,11 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-16 14:16+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-11-01 12:21+0100\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,7 +134,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:121
 msgid "Printers"
-msgstr ""
+msgstr "Ù¾Ø±ÙÙ¹Ø±Ø²"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:123
 msgid "Printers configuration"
@@ -209,65 +209,65 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:141
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:142
 msgid ""
 "Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:169
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:170
 msgid "Passphrase:"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:177
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:178
 msgid "Verify Passphrase:"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:188
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:244
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:189
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:245
 msgid "Passphrase can't be empty"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:235
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:236
 msgid "Passphrases do not match"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:284
 #: ../lib/Tails/Persistence/Step/Delete.pm:103
 #: ../lib/Tails/Persistence/Step/Configure.pm:181
 msgid "Failed"
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:291
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:292
 msgid "Mounting Tails persistence partition."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:294
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "The Tails persistence partition will be mounted."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:303
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304
 msgid "Correcting permissions of the persistent volume."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:306
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307
 msgid "The permissions of the persistent volume will be corrected."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:314
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:315
 msgid "Creating default persistence configuration."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:317
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:318
 msgid "The default persistence configuration will be created."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:333
 msgid "Creating..."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:336
 msgid "Creating the persistent volume..."
 msgstr ""
 

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

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-15 Thread translation

commit dbef22c4546dd6a84f3e47d869f62d8ecaef8201
Author: Translation commit bot 
Date:   Thu Nov 15 16:47:32 2018 +

Update translations for tba-android_stringsdtd
---
 ur/android_strings.dtd | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ur/android_strings.dtd b/ur/android_strings.dtd
index b1b3806bd..a710d8c08 100644
--- a/ur/android_strings.dtd
+++ b/ur/android_strings.dtd
@@ -112,7 +112,7 @@
 
 
 
-
+
 
 
 
@@ -136,8 +136,8 @@
  the content description. -->
 
 
-
-
+
+
 
 
 
@@ -200,7 +200,7 @@
  The  in the string will be replaced by a small image of the icon 
described, and can be moved to wherever
  it is applicable. -->
 
-
+
 
@@ -247,7 +247,7 @@
 
 
 
-
+
 
 
 
@@ -260,7 +260,7 @@
  context means consuming less data, e.g. by not loading images, not
  âstoring dataâ. -->
 
-
+
 
 
 
@@ -400,7 +400,7 @@
 
 
 
-
+
 
 
 
@@ -435,20 +435,20 @@
  actual notification that an update is available. -->
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -478,16 +478,16 @@
 
 
-
+
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -544,7 +544,7 @@
 
 
 
-
+
 
 
 
@@ -563,7 +563,7 @@
 
 
 
-
+
 
 
 
@@ -704,7 +704,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 
@@ -742,7 +742,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
-
+
 
 
 

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-11-15 Thread translation

commit 5fa75b944732d32bde95d97a3b71e8e01fb80dd4
Author: Translation commit bot 
Date:   Thu Nov 15 16:46:50 2018 +

Update translations for tails-greeter-2
---
 ur/ur.po | 24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index 14712e53e..56f5fa1d3 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -3,14 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# Tor Project , 2016
+# A. Saad Imran, 2016
+# guardianproject , 2018
+# Muhammad Ishaq , 2018
+# Giovanni Pellerano , 2018
+# erinm, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-22 14:15+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Giovanni Pellerano , 
2018\n"
+"POT-Creation-Date: 2018-09-04 09:46+0200\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: erinm, 2018\n"
 "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +243,7 @@ msgstr ""
 
 #: ../tailsgreeter/gui.py:397
 msgid "Offline"
-msgstr ""
+msgstr "Ø§ÙÙ ÙØ§Ø¦Ù"
 
 #: ../tailsgreeter/gui.py:481
 msgid "Failed to relock persistent storage."
@@ -275,14 +283,14 @@ msgstr ""
 msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:89
+#: ../tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -290,7 +298,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:156
+#: ../tailsgreeter/persistence.py:158
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -298,7 +306,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:170
+#: ../tailsgreeter/persistence.py:172
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

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

2018-11-15 Thread translation

commit 277bdbf9e404964899e6ddcf63150a1cd5597da8
Author: Translation commit bot 
Date:   Thu Nov 15 16:46:40 2018 +

Update translations for tails-perl5lib
---
 ur.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ur.po b/ur.po
index d3bf28c6b..d4d0d3417 100644
--- a/ur.po
+++ b/ur.po
@@ -6,11 +6,11 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-03-31 13:21+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-08-16 11:11+0200\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/RunningSystem.pm:159
+#: ../lib/Tails/RunningSystem.pm:190
 msgid "Error"
 msgstr "ØºÙØ·Û"
 
-#: ../lib/Tails/RunningSystem.pm:161
+#: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
 msgstr ""
 
-#: ../lib/Tails/RunningSystem.pm:192
+#: ../lib/Tails/RunningSystem.pm:220
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"

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

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

2018-11-15 Thread translation

commit 771808a927982918fd1fc1969f25449da31324c8
Author: Translation commit bot 
Date:   Thu Nov 15 16:46:19 2018 +

Update translations for tails-misc
---
 ur.po | 102 +-
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/ur.po b/ur.po
index 0c5e38962..77f489ce7 100644
--- a/ur.po
+++ b/ur.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 14:43+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-10-31 16:04+0100\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,13 +86,13 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/bin/liferea:33
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
-msgstr ""
+msgstr "_Launch"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/bin/liferea:32
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
-msgstr ""
+msgstr "_Exit"
 
 #: config/chroot_local-includes/usr/local/bin/liferea:18
 msgid "Liferea is deprecated"
@@ -118,7 +118,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
-msgstr ""
+msgstr "Ø¨ÙØ¯ Ú©Ø±ÛÚº"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:22
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
@@ -145,91 +145,91 @@ msgstr ""
 msgid "not available"
 msgstr ""
 
-#. Translators: Don't translate {details}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
 #, python-brace-format
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Show Log"
-msgstr ""
+msgstr "ÙØ§Ú¯ Ø¯Ú©Ú¾Ø§Ø¦ÛÛ"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Configure"
 msgstr ""
 
-#. Translators: Don't translate {beginning} or {last}, they are placeholders
-#. and will be replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222
 #, python-brace-format
 msgid "{beginning} and {last}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
 msgid ", "
 msgstr ""
 
-#. Translators: Don't translate {packages}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
 #, python-brace-format
 msgid "Add {packages} to your additional software?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293
 msgid "Install Every Time"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Install Only Once"

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

2018-11-15 Thread translation

commit 6e102d5a74bca7bd8b31094d9fcf736c710fc07f
Author: Translation commit bot 
Date:   Thu Nov 15 16:46:30 2018 +

Update translations for tails-iuk
---
 ur.po | 102 +-
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/ur.po b/ur.po
index 4d47d5b5c..8d6b52172 100644
--- a/ur.po
+++ b/ur.po
@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-05-26 08:49+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,18 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -37,64 +37,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:334
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:356
 msgid ""
 "An incremental upgrade is available, but no full upgrade is.\n"
 "This should not happen. Please report a bug."
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:361
+#: ../lib/Tails/IUK/Frontend.pm:360
 msgid "Error while detecting available upgrades"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:371
+#: ../lib/Tails/IUK/Frontend.pm:370
 #, perl-brace-format
 msgid ""
 "You should upgrade to %{name}s %{version}s.\n"
@@ -110,19 +110,19 @@ msgid ""
 "Do you want to upgrade now?"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:386
+#: ../lib/Tails/IUK/Frontend.pm:385
 msgid "Upgrade available"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:387
+#: ../lib/Tails/IUK/Frontend.pm:386
 msgid "Upgrade now"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:388
+#: ../lib/Tails/IUK/Frontend.pm:387
 msgid "Upgrade later"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:396
+#: ../lib/Tails/IUK/Frontend.pm:395
 #, perl-brace-format
 msgid ""
 "You should do a manual upgrade to %{name}s %{version}s.\n"
@@ -134,20 +134,20 @@ msgid ""
 "To learn how to do a manual upgrade, go to 
https://tails.boum.org/doc/first_steps/upgrade/#manual;
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:412
+#: ../lib/Tails/IUK/Frontend.pm:411
 msgid "New version available"
 msgstr ""
 
-#: ../lib/Tails/IUK/Frontend.pm:469
+#: ../lib/Tails/IUK/Frontend.pm:468
 msgid "Downloading upgrade"
 msgstr ""
 
-#:

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

2018-11-15 Thread translation

commit adda04ee475f22667ae5065f1e2d874ffe60901c
Author: Translation commit bot 
Date:   Thu Nov 15 16:46:10 2018 +

Update translations for mat-gui
---
 ur.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ur.po b/ur.po
index c3103cc89..9872204a9 100644
--- a/ur.po
+++ b/ur.po
@@ -7,11 +7,11 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-02-20 18:56+\n"
-"Last-Translator: Umar Hayat\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +83,7 @@ msgstr ""
 
 #: mat-gui:280
 msgid "Unknown"
-msgstr ""
+msgstr "ÙØ¨Ø¹Ù"
 
 #: mat-gui:325
 msgid "Not-supported"
@@ -119,7 +119,7 @@ msgstr ""
 
 #: mat-gui:379
 msgid "Include"
-msgstr ""
+msgstr "Ø¨Ø´ÙÙÙ"
 
 #: mat-gui:397
 #, python-format

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-11-15 Thread translation

commit f56ed55e9f7528304612ab377fac60ff02bc
Author: Translation commit bot 
Date:   Thu Nov 15 13:47:26 2018 +

Update translations for tor-browser-manual
---
 fa/fa.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fa/fa.po b/fa/fa.po
index c1923b43f..890636aa5 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -16,13 +16,14 @@
 # AmirHossein Zarei , 2018
 # Hassan Matinarfa , 2018
 # A.Mehraban , 2018
+# Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2018-09-07 16:48-0500\n"
 "PO-Revision-Date: 2016-12-07 01:01+\n"
-"Last-Translator: A.Mehraban , 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -365,6 +366,9 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations, such as"
 " Dropbox, Google Drive and GitHub."
 msgstr ""
+" GetTor Ø³Ø±ÙÛØ³Û Ø§Ø³Øª Ú©Ù Ø¨Ù ØµÙØ±Øª Ø§ØªÙÙØ§ØªÛÚ© Ø¨Ù Ù¾ÛØ§Ù
âÙØ§Ø Ø¢Ø®Ø±ÛÙ ÙØ³Ø®Ù ÙØ±ÙØ±Ú¯Ø± Tor Ø±Ø§ "
+"Ú©Ù Ø¯Ø± ÙÚ©Ø§ÙâÙØ§ÛÛ Ú©Ù Ú©ÙØªØ± ÙØ³Ø¯ÙØ¯ ÙÛâØ´ÙÙØ¯Ø Ù
Ø§ÙÙØ¯ DropboxØ Google Drive Ù GitHub "
+"Ø§Ø±Ø³Ø§Ù ÙÛâÚ©ÙÙØ¯. "
 
 #: downloading.page:33
 msgid "To use GetTor via email:"

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

[tor-commits] [tor-glossary/master] update german translations (#28417)

2018-11-15 Thread emmapeel

commit ad1edfe14c1954eb17646ab89100f880b31dd883
Author: traumschule 
Date:   Thu Nov 15 11:21:41 2018 +0100

update german translations (#28417)
---
 glossary_de.csv | 228 
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/glossary_de.csv b/glossary_de.csv
index 797ca76..b01c5a9 100644
--- a/glossary_de.csv
+++ b/glossary_de.csv
@@ -1,7 +1,7 @@
 term,pos,comment,de
- donation process,,,
- testing,,,
- third-party,,,
+ donation process,,, Spendenprozess
+ testing,,, wird geprÃ¼ft
+ third-party,,, aus dritter Hand
 !,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",!
 ,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ 
is not an option in Transifex",Â»Â«
 $,,,
@@ -13,7 +13,7 @@ $,,,
 Two-factor authentication
 ""Something you know, and something you have."" Login systems that require 
only a username and password risk being broken when someone else can obtain (or 
guess) those pieces of information. Services that offer two-factor 
authentication also require you to provide a separate confirmation that you are 
who you say you are. The second factor could be a one-off secret code, a number 
generated by a program running on a mobile device, or a device that you carry 
and that you can use to confirm who you are. Companies like banks, and major 
internet services like Google, Paypal and Twitter now offer two-factor 
authentication.
 Synonyms: two-step verification, multi-factor authentication.
-Source EFF.",
+Source EFF.",2-Faktor-Authentifzierung
 3D bar chart,Noun,[Martus],3D Balkendiagramm
 3rd party,Adjective,[Signal] As in âUse a 3rd party application.â,
 :,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",:
@@ -24,7 +24,7 @@ A security-oriented operating system,Noun,[Qubes OS],Ein 
sicherheitsorientiertes
 ADIDS,Noun,what is that?,
 API,Noun,"Application Programming Interface: ""In computer programming, an 
application programming interface (API) is a set of subroutine definitions, 
protocols, and tools for building application software."" - Wikipedia",API
 APK,Noun,"""Android application package (APK) is the package file format used 
to distribute and install application software and middleware onto Google's 
Android operating system and sometimes on the BlackBerry OS 10."" 
https://en.wikipedia.org/wiki/Android_application_package",APK
-About,Noun,,
+About,Noun,,Ãber
 Alice,,[Briar],
 American Apparel,,,
 Android,Noun,[Signal] [Orbot] Operating system,Android
@@ -33,73 +33,73 @@ App Store,Noun,Apple App Store [Signal],App Store
 AppVM,Noun,"[Qubes OS] ""Application Virtual Machine""A VM which is intended 
for running software applications.",
 Apt.,,,
 Ativistas,,,
-Autocrypt Setup Message,Noun,[Enigmail] [OpenKeychain],
-Autonomous System number,Noun,,
+Autocrypt Setup Message,Noun,[Enigmail] [OpenKeychain],Autocrypt 
Installations-Nachricht
+Autonomous System number,Noun,,AS-Nummer
 BCC,Noun,"""Blind carbon copy""",BCC
-Back,Adverb,,
-Back to,,,
+Back,Adverb,,ZurÃ¼ck
+Back to,,,ZurÃ¼ck zu
 Backup Key File,Noun,[Martus] Also: key backup,SicherungsschlÃ¼sseldatei
 Benetech,Noun,Company name which should not be translated or transcribed.,
 BitTorrent,,,
 Bitcoin,,,
-Blow the Whistle,Noun,[Globaleaks],
+Blow the Whistle,Noun,[Globaleaks],Hinweise geben
 Blow the Whistle,Verb,[Globaleaks] GlobaLeaks catch phrase,Hinweise geben
 Bob,,[Briar],
-Bug,,,
+Bug,,,Fehler
 C,Noun,"A command and control server (C or C2) is a computer that gives 
orders to malware-infected devices and receives information from those devices. 
Some C servers control millions of devices.
 Synonyms: Command and control server, C2.
-Source EFF.",
+Source EFF.","C (Kommando und Kontroll-Server, kontrolliert infizierte 
Computer)"
 C2,Noun,"A command and control server (C or C2) is a computer that gives 
orders to malware-infected devices and receives information from those devices. 
Some C servers control millions of devices.
 Synonyms: Command and control server, C2.
-Source EFF.",
-CFC program,,,
+Source EFF.","C2 (Kommando und Kontroll-Server, kontrolliert infizierte 
Computer)"
+CFC program,,,CFC-Programm
 CIDR,Noun,Classless inter-domain routing,
 CPU,Noun,,
 CSR,Noun,Certificate Signing Request,
 CSRF,Noun,,
 CVC,,,
-Cancel,Verb,,
-Card Number,,,
+Cancel,Verb,,Abbrechen
+Card Number,,,Kartennummber
 Carol,,[Briar],
-Certificate Signing Request,Noun,,
+Certificate Signing Request,Noun,,CSR (Zertifikat-Signierungs-Anfrage)
 ChatSecure,Noun,Application Name,
 Chrome App,Noun,[Signal],
 Chrome OS,Noun,,
 Chrome Web Store,Noun,,
-Circuit Display,Noun,[Tor],
-Clear,Noun,,
-Clearnet,Noun,,Sichtbare Internet
-Client User Interface,Noun,,Client-BenutzeroberflÃ¤che
+Circuit Display,Noun,[Tor],Kanal-Anzeige
+Clear,Noun,,LÃ¶schen
+Clearnet,Noun,,Sichtbares Internet
+Client User Interface,Noun,,Programm-BenutzeroberflÃ¤che

[tor-commits] [tor-glossary/master] german: fixup typos

2018-11-15 Thread emmapeel

commit 86c6a53271bfd0436de9f039cbb76088ff96f47e
Author: traumschule 
Date:   Thu Nov 15 11:41:28 2018 +0100

german: fixup typos
---
 glossary_de.csv | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/glossary_de.csv b/glossary_de.csv
index b01c5a9..7f090a9 100644
--- a/glossary_de.csv
+++ b/glossary_de.csv
@@ -869,7 +869,7 @@ break in,Noun,,Einbruch
 bridge,Noun,[Orbot] [Tor],BrÃ¼cke
 bridge,Verb,[Tor],Ã¼berbrÃ¼cken
 bridge line,Noun,[Tor] a line with the bridge 
configuration,BrÃ¼cken-Konfiguration
-bridge relay,Noun,[Tor],BrÃ¼cken-Relais
+bridge relay,Noun,[Tor],BrÃ¼cken-Relay
 bridge type,Noun,[Tor],BrÃ¼cken-Typ
 broad range,,,
 broadcast,Verb,[Signal],
@@ -903,7 +903,7 @@ cannot,Verb,,kann nicht
 capability,Noun,"The capability of an attacker (in the context of an attack) 
is what it is able to do to achieve its aims. For example, a country's security 
services might have the capability to listen to telephone calls while a 
neighbor may have the capability to watch you from their window. To say that an 
attacker âhas"" a capability does not mean that they will necessarily use 
that capability. It does mean that you should consider and prepare for the 
possibility.
 Source EFF.",FÃ¤higkeit
 car documents,Noun,[Umbrella],KFZ-Brief
-carjacking,Noun,,KFZ-Dienstahl
+carjacking,Noun,,KFZ-Diebstahl
 carry,,,tragen
 case management,Noun,[GlobaLeaks],Fall-Verwaltung
 cash,,,Bargeld
@@ -1185,7 +1185,7 @@ end-user,Noun,,
 engine,,,
 ensure,,,
 enter,Verb,,eingeben
-entry guard,Noun,,EingangswÃ¤chter
+entry guard,Noun,,Einstiegs-Schutz-Server
 error,Adjective,,
 error,Noun,[Signal],Fehler
 event log,Noun,,
@@ -1286,8 +1286,8 @@ gist,Noun,"""In computing, Gist is a scientific graphics 
library written in C by
 giving,,,
 goal,Noun,,
 grants,,,
-guard,Noun,,WÃ¤chter
-guard relay,Noun,[The Tor Project],WÃ¤chterrelais
+guard,Noun,,Schutz
+guard relay,Noun,[The Tor Project],Schutz-Relay
 guidelines,Noun,,Richtlinien
 handshake,Noun,Signal exchange process between pieces of equipment until they 
are synchronized. Transmitting and receiving communication can then take 
place.,Handschlag
 hardware,,,
@@ -1473,7 +1473,7 @@ meta search engine,,,
 metadata,Noun,"Metadata (or ""data about data"") is everything about a piece 
of information, apart from the information itself. So the content of a message 
is not metadata, but who sent it, when, where from, and to whom, are all 
examples of metadata. Legal systems often protect content more than metadata: 
for instance, in the United States, law enforcement needs a warrant to listen 
to a person's telephone calls, but claims the right to obtain the list of who 
you have called far more easily. However, metadata can often reveal a great 
deal, and will often need to be protected as carefully as the data it 
describes. (Source EFF) [Signal]",Meta-Daten
 method,,,
 microphone,Noun,[Signal],
-middle relay,Noun,,Mittel-Relais
+middle relay,Noun,,Mittel-Relay
 migrate,Verb,[Signal],
 miniLock,Noun,,miniLock
 minimize,Verb,Minimize a window,
@@ -1530,7 +1530,7 @@ obfuscation layer,Noun,"Related to data transmission
 [Tor]",Verschleierungs-Schicht
 offline,Adjective,[Signal],
 onboarding,Noun,,BegrÃ¼Ãung
-once,,,ein Mai
+once,,,ein Mal
 onion service,Noun,[Tor],Onion-Dienst
 online,,,
 online,Adjective,[Signal],

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

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

2018-11-15 Thread translation

commit 3644d22ef16282a4eebdcdfc95f5f35d5f598f70
Author: Translation commit bot 
Date:   Thu Nov 15 17:19:35 2018 +

Update translations for torcheck_completed
---
 ko/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/torcheck.po b/ko/torcheck.po
index 04586a319..57d8a6fff 100644
--- a/ko/torcheck.po
+++ b/ko/torcheck.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-10-04 00:24+\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\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/torcheck] Update translations for torcheck

2018-11-15 Thread translation

commit 99d22cf33dd3c3a4b9c21b5353af1af9bbb39e41
Author: Translation commit bot 
Date:   Thu Nov 15 17:19:29 2018 +

Update translations for torcheck
---
 ko/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/torcheck.po b/ko/torcheck.po
index 04586a319..57d8a6fff 100644
--- a/ko/torcheck.po
+++ b/ko/torcheck.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-10-04 00:24+\n"
+"PO-Revision-Date: 2018-11-15 17:07+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\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/support-portal] Update translations for support-portal

2018-11-15 Thread translation

commit 6a8c060e65fd463178d1cd4e31f40579011e44e1
Author: Translation commit bot 
Date:   Thu Nov 15 17:20:10 2018 +

Update translations for support-portal
---
 contents+ka.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 8e80e3f6b..7c78f3909 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2018
-# A. C., 2018
 # Emma Peel, 2018
+# A. C., 2018
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: A. C., 2018\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1113,12 +1113,12 @@ msgstr ""
 #: http//localhost/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.title)
 msgid "How do I update Tor Browser?"
-msgstr ""
+msgstr "á áááá  ááááááá®áá Tor-áá áá£ááá 
á?"
 
 #: http//localhost/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
 msgid "You can update Tor Browser as soon as a new version is released."
-msgstr ""
+msgstr "Tor-áá áá£ááá áá¡ ááááá®áááá 
á¨áááá«áááá áá®ááá ááá á¡ááá¡ 
ááááá¡áááá¡áááááá."
 
 #: http//localhost/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)

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

[tor-commits] [tor/release-0.3.5] Appveyor: add comments to the config file

2018-11-15 Thread nickm

commit 27b91704753ae3235630b298449b4c8a107bd107
Author: teor 
Date:   Thu Nov 15 18:57:39 2018 +1000

Appveyor: add comments to the config file

Documentation for 28399, 28454, and previous fixes.
---
 .appveyor.yml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index c288ad812..f76a9f0a9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
 mingw_prefix: mingw-w64-x86_64
+# hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
 hardening: --disable-gcc-hardening
 
 install:
@@ -28,11 +29,17 @@ install:
 {
 Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
 }
+<# mingw packages start with ${env:mingw_prefix}
+ # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+ #
+ # Use pacman --debug to show package downloads and install locations
+ #>
 Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed 
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl 
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
 
 build_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler and user binaries to build and install #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin", 
"C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
@@ -43,6 +50,10 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
+<# compile for mingw
+ # mingw zstd doesn't come with a pkg-config file, so we manually
+ # configure its flags. liblzma just works.
+ #>
 Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
@@ -51,6 +62,7 @@ build_script:
 test_script:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 compiler binaries to make check #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
 $env:Path = $buildpath -join ';'
@@ -61,14 +73,17 @@ test_script:
 on_failure:
 - ps: >-
 if ($env:compiler -eq "mingw") {
+<# use the MSYS2 user binaries to archive failures #>
 $oldpath = ${env:Path} -split ';'
 $buildpath = @("C:\msys64\usr\bin") + $oldpath
 $env:Path = @($buildpath) -join ';'
 Set-Location "${env:build}"
+<# store logs as appveyor artifacts: see the artifacts tab #>
 Execute-Bash "7z a logs.zip config.log || true"
 Execute-Bash "7z a logs.zip test-suite.log || true"
 Execute-Bash "appveyor PushArtifact logs.zip || true"
 Execute-Bash "tail -1000 config.log || true"
 Execute-Bash "cat test-suite.log || true"
 }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-15 Thread nickm

commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1
Merge: d598d834f 27b917047
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-11-15 Thread nickm

commit d94715e2d0c34f9bb9c4871167e79b06750513a1
Merge: f41374b03 27b917047
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Appveyor: manually add zstd flags to configure

2018-11-15 Thread nickm

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed
Author: teor 
Date:   Thu Nov 15 18:32:52 2018 +1000

Appveyor: manually add zstd flags to configure

The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
---
 .appveyor.yml| 2 +-
 changes/bug28454 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fdf831686..c288ad812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28454 b/changes/bug28454
new file mode 100644
index 0..ca46ae277
--- /dev/null
+++ b/changes/bug28454
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Manually configure the zstd compiler options, when building using
+  mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+  come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/release-0.3.4] Appveyor: remove incorrect OpenSSL path

2018-11-15 Thread nickm

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor 
Date:   Thu Nov 15 14:32:53 2018 +1000

Appveyor: remove incorrect OpenSSL path

Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml| 4 +---
 changes/bug28399 | 4 
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
 compiler_path: mingw32
-openssl_path: /c/OpenSSL-Win32
 mingw_prefix: mingw-w64-i686
 hardening:
   - target: x86_64-w64-mingw32
 compiler_path: mingw64
-openssl_path: /c/OpenSSL-Win64
 mingw_prefix: mingw-w64-x86_64
 hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 0..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Stop using an external OpenSSL install, and stop installing MSYS2
+  packages, when building using mingw on Appveyor Windows CI.
+  Fixes bug 28399; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/release-0.3.4] Appveyor: manually add zstd flags to configure

2018-11-15 Thread nickm

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed
Author: teor 
Date:   Thu Nov 15 18:32:52 2018 +1000

Appveyor: manually add zstd flags to configure

The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
---
 .appveyor.yml| 2 +-
 changes/bug28454 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fdf831686..c288ad812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 Set-Location "${env:build}"
 Execute-Bash "which ${env:target}-gcc"
 Execute-Bash "${env:target}-gcc --version"
-Execute-Bash "../configure --prefix=/${env:compiler_path} 
--build=${env:target} --host=${env:target} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--disable-asciidoc --enable-fatal-warnings ${env:hardening}"
 Execute-Bash "V=1 make -j2"
 Execute-Bash "V=1 make -j2 install"
  }
diff --git a/changes/bug28454 b/changes/bug28454
new file mode 100644
index 0..ca46ae277
--- /dev/null
+++ b/changes/bug28454
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+- Manually configure the zstd compiler options, when building using
+  mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+  come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-15 Thread nickm

commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1
Merge: d598d834f 27b917047
Author: Nick Mathewson 
Date:   Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 .appveyor.yml| 21 +
 changes/bug28399 |  4 
 changes/bug28454 |  4 
 3 files changed, 25 insertions(+), 4 deletions(-)




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

[tor-commits] [styleguide/master] Fix color code typo

2018-11-15 Thread hiro

commit e309e64c91b6f14a3f6fe1b1e8cc0d1b2cdf6ab1
Author: hiro 
Date:   Thu Nov 15 15:23:29 2018 +0100

Fix color code typo
---
 i18n/contents.pot  | 2 +-
 templates/visuals.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 0a8a1f9..f2332af 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-02 14:19+CET\n"
+"POT-Creation-Date: 2018-11-02 14:20+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
diff --git a/templates/visuals.html b/templates/visuals.html
index a620660..3b9b478 100644
--- a/templates/visuals.html
+++ b/templates/visuals.html
@@ -27,7 +27,7 @@
   Purple
   
   
-  #59316B
+  #484848
   Dark Grey
   
   
@@ -39,7 +39,7 @@
   Grey
   
   
-  #484848
+  #59316B
   Dark Purple
   
   

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

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-11-15 Thread translation

commit 45b6172c54bb9fd2749d4c95a9fdd30b4a676dcc
Author: Translation commit bot 
Date:   Thu Nov 15 15:19:41 2018 +

Update translations for support-portal
---
 contents+bn.po| 15 ---
 contents+ca.po| 15 ---
 contents+de.po| 15 ---
 contents+el.po| 15 ---
 contents+es-AR.po | 15 ---
 contents+es.po| 15 ---
 contents+fa.po| 13 -
 contents+fr.po| 15 ---
 contents+ga.po| 15 ---
 contents+he.po| 13 -
 contents+id.po| 14 --
 contents+is.po| 13 -
 contents+it.po| 15 ---
 contents+ka.po| 13 -
 contents+ko.po| 13 -
 contents+nb.po| 13 -
 contents+pt-BR.po | 15 ---
 contents+pt-PT.po | 13 -
 contents+ru.po| 15 ---
 contents+tr.po| 15 ---
 contents+zh-CN.po | 13 -
 contents.pot  | 17 +
 22 files changed, 89 insertions(+), 226 deletions(-)

diff --git a/contents+bn.po b/contents+bn.po
index e40cabc8a..aa8ceb463 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-15 13:05+CET\n"
+"POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -2623,8 +2623,10 @@ msgstr ""
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
+#: http//localhost/censorship/censorship-5/
+#: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these  in your Tor log, it means you are failing to "
+"If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
 "à¦¯à¦¦à¦¿ à¦à¦ªà¦¨à¦¿ à¦à¦ªà¦¨à¦¾à¦° à¦à¦° à¦²à¦à§ à¦à¦ 
à¦§à¦°à¦¨à§à¦° à¦²à¦¾à¦à¦¨à¦à§à¦²à§ à¦¦à§à¦à§à¦¨, à¦à¦° à¦®à¦¾à¦¨à§ 
à¦à¦ªà¦¨à¦¿ à¦à¦à¦à¦¿ à¦®à§à¦à¦¾ "
@@ -2985,15 +2987,6 @@ msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°à§à¦°-à¦¸à¦¾à¦¥à§-à¦¸à¦à¦¯à§à¦-à¦
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these in your Tor log, it means you are failing to "
-"connect to a SOCKS proxy."
-msgstr ""
-"à¦¯à¦¦à¦¿ à¦à¦ªà¦¨à¦¿ à¦à¦ªà¦¨à¦¾à¦° à¦à¦° à¦²à¦à§ à¦à¦ 
à¦§à¦°à¦¨à§à¦° à¦²à¦¾à¦à¦¨à¦à§à¦²à§ à¦¦à§à¦à§à¦¨, à¦à¦° à¦®à¦¾à¦¨à§ 
à¦à¦ªà¦¨à¦¿ à¦à¦à¦à¦¿ à¦®à§à¦à¦¾ "
-"à¦ªà§à¦°à¦à§à¦¸à¦¿à¦° à¦¸à¦¾à¦¥à§ à¦¸à¦à¦¯à§à¦ à¦à¦°à¦¤à§ 
à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à¦¨ à¥¤"
-
-#: http//localhost/censorship/censorship-5/
-#: (content/censorship/censorship-5/contents+en.lrquestion.description)
-msgid ""
 "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time "
 "(OR:xxx.xx.x.xx:): It seems that our clock is behind by 1 days, 0 hours,"
 " 1 minutes, or that theirs is ahead."
diff --git a/contents+ca.po b/contents+ca.po
index 978afd383..24bf585a7 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-15 13:05+CET\n"
+"POT-Creation-Date: 2018-11-15 16:05+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -2653,8 +2653,10 @@ msgstr ""
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
+#: http//localhost/censorship/censorship-5/
+#: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these  in your Tor log, it means you are failing to "
+"If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
 "Si veieu lÃnies com aquestes al vostre registre de Tor, significa que no "
@@ -3014,15 +3016,6 @@ msgstr "no-puc-connectar-navegador-tor"
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid ""
-"If you see lines like these in your Tor log, it means you are failing to "
-"connect to a SOCKS proxy."
-msgstr ""
-"Si veieu lÃnies com aquestes al vostre registre de Tor, significa que no "
-"esteu connectant a un proxy SOCKS."
-
-#: http//localhost/censorship/censorship-5/
-#: (content/censorship/censorship-5/contents+en.lrquestion.description)
-msgid ""
 "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time "
 "(OR:xxx.xx.x.xx:): It seems that our clock is behind by 1 days, 0 hours,"
 " 1 minutes, or that theirs is ahead."
diff --git a/contents+de.po

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

2018-11-15 Thread translation

commit b9d8eca47acf19be157e13569e5b5267df4f5b3e
Author: Translation commit bot 
Date:   Thu Nov 15 16:45:14 2018 +

Update translations for bridgedb
---
 ur/LC_MESSAGES/bridgedb.po | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index 726ed3cd1..359014d5c 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -6,11 +6,11 @@
 # Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: 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: 2017-09-19 19:57+\n"
-"Last-Translator: Muhammad Sohaib Raza \n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,11 +36,11 @@ msgstr ""
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr ""
+msgstr "ÙØ³Ø¦ÙÛ Ø±Ù¾ÙØ±Ù¹ Ú©Ø±ÛÚº"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
-msgstr ""
+msgstr "Ø³ÙØ±Ø³ Ú©ÙÚ"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
@@ -52,11 +52,11 @@ msgstr "Ø±Ø§Ø¨Ø·Û"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "ØªÙØ§Ù ÙÙØªØ®Ø¨ Ú©Ø±ÛÚº."
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Ú©ÛÙ Ø¢Ø± Ú©ÙÚ Ø¸Ø§ÛØ± Ú©Ø±ÛÚºÛ"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
@@ -133,7 +133,7 @@ msgstr ""
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
-msgstr ""
+msgstr "ÙØ²ÛØ¯ Ø§ÙØªØ®Ø§Ø¨Ø§ØªÛ"
 
 #: bridgedb/https/templates/options.html:86
 msgid "No"
@@ -141,7 +141,7 @@ msgstr "ÙÛÛÚº"
 
 #: bridgedb/https/templates/options.html:87
 msgid "none"
-msgstr ""
+msgstr "Ú©ÙØ¦Û ÙÛÛÚº"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -161,7 +161,7 @@ msgstr ""
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+msgstr "[ÛÛ Ø§ÛÚ© Ø®ÙØ¯Ú©Ø§Ø± Ù¾ÛØºØ§Ù ÛÛ: Ø¨Ø±Ø§Û ÙÛØ±Ø¨Ø§ÙÛ 
Ø¬ÙØ§Ø¨ ÙÛ Ø¯ÛØ¬ÛÛ]"
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
@@ -182,7 +182,7 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr ""
+msgstr "BridgeDB ÙÛÚº Ø®ÙØ´ Ø§ÙÙØ¯ÛØ¯"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
@@ -192,15 +192,15 @@ msgstr ""
 #: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr ""
+msgstr "ÛÛÙÙ Ø %s"
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr ""
+msgstr "ÛÛÙÙ Ø¯ÙØ³ØªÙ!"
 
 #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr ""
+msgstr "Ø¹ÙØ§ÙÛ ÚØ§Ø¨Û"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
@@ -308,7 +308,7 @@ msgstr ""
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr ""
+msgstr "Ú©ÛØ§ Ø§ÙÙ¾ Ú©Ù Ø§ÛÚ© %s ÚØ§Ø¦ÛÛ Ø"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
@@ -356,7 +356,7 @@ msgstr ""
 
 #: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr ""
+msgstr "Ø§Ø³ Ù¾ÛØºØ§Ù Ú©Ù Ø¯Ú©Ú¾Ø§ØªØ§ ÛÛÛ"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-15 Thread translation

commit a76b7af9ca2218c5872fe4be46b003ad63c30e9d
Author: Translation commit bot 
Date:   Thu Nov 15 16:45:03 2018 +

Update translations for abouttor-homepage
---
 ur/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ur/aboutTor.dtd b/ur/aboutTor.dtd
index bd71be248..df02f2b07 100644
--- a/ur/aboutTor.dtd
+++ b/ur/aboutTor.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
+
+
 
 
 https://duckduckgo.com;>

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-11-15 Thread translation

commit 70511740d81f92451f1f01403913a480bfabe60f
Author: Translation commit bot 
Date:   Thu Nov 15 16:45:58 2018 +

Update translations for liveusb-creator
---
 ur/ur.po | 94 
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index 678e8ccb7..408376b3f 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-11-15 16:35+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -76,194 +76,194 @@ msgstr ""
 msgid "Removing existing Live OS"
 msgstr ""
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr ""
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
 
-#: ../tails_installer/creator.py:996
+#: ../tails_installer/creator.py:998
 msgid "Trying to continue anyway."
 msgstr ""
 
-#: ../tails_installer/creator.py:1005 ../tails_installer/creator.py:1401
+#: ../tails_installer/creator.py:1007 ../tails_installer/creator.py:1405
 msgid "Verifying filesystem..."
 msgstr ""
 
-#: ../tails_installer/creator.py:1029
+#: ../tails_installer/creator.py:1031
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1434
+#: ../tails_installer/creator.py:1037 ../tails_installer/creator.py:1440
 msgid "Installing bootloader..."
 msgstr ""
 
-#: ../tails_installer/creator.py:1061
+#: ../tails_installer/creator.py:1064
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
 
-#: ../tails_installer/creator.py:1069 ../tails_installer/creator.py:1452
+#: ../tails_installer/creator.py:1072 ../tails_installer/creator.py:1458
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1183
+#: ../tails_installer/creator.py:1186
 #, python-format
 msgid "%s already

[tor-commits] [styleguide/master] Fix typo in color code

2018-11-15 Thread hiro

commit 8fc234363e482e51f78b6f6c3418dbdf3ff167db
Author: hiro 
Date:   Thu Nov 15 17:44:30 2018 +0100

Fix typo in color code
---
 templates/visuals.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/visuals.html b/templates/visuals.html
index 3b9b478..3c690f6 100644
--- a/templates/visuals.html
+++ b/templates/visuals.html
@@ -27,7 +27,7 @@
   Purple
   
   
-  #484848
+  #333A41
   Dark Grey
   
   

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

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

2018-11-15 Thread translation

commit c93953c596285b008fa7a5792b18a10a3df48c35
Author: Translation commit bot 
Date:   Thu Nov 15 16:45:46 2018 +

Update translations for https_everywhere
---
 ur/https-everywhere.dtd |  4 ++--
 ur/ssl-observatory.dtd  | 21 ++---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ur/https-everywhere.dtd b/ur/https-everywhere.dtd
index 0307fdf79..15e527597 100644
--- a/ur/https-everywhere.dtd
+++ b/ur/https-everywhere.dtd
@@ -12,7 +12,7 @@
 
 
 
-
+
 
 
 
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/ur/ssl-observatory.dtd b/ur/ssl-observatory.dtd
index 80aeb4126..caabc3d9b 100644
--- a/ur/ssl-observatory.dtd
+++ b/ur/ssl-observatory.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 -->
 
 
 
+"Ø§Ø³Û ÙØ¬Ø§Ø² Ø¨ÙØ§ÙØ§ ÙØÙÙØ¸ ÛÛØ Ø¬Ø¨ ØªÚ© Ú©Û Ø¢Ù¾ ÙÛØ§ÛØª 
Ø¯Ø®Ù Ø§ÙØ¯Ø§Ø² ÙØ´ØªØ±Ú©Û ÙØ¸Ø§Ù Ø§Ø³ØªØ¹ÙØ§Ù ÙÛ Ú©Ø±ÛÚºÛ">
 
 
+"ÙØÙÙØ¸ ÛÛØ Ø¬Ø¨ ØªÚ© Ø¢Ù¾ ÙØ´ØªØ±Ú©Û ÙØ¸Ø§Ù Ø®ÙÛÛ 
Ø§ÙÙ¹Ø±Ø§ÙÛÙ¹ Ø³Ø±ÙØ± Ú©Û Ø³Ø§ØªÚ¾ Ø§Ø³ØªØ¹ÙØ§Ù Ú©Ø±ÛÚºÛ">
 
 
@@ -32,11 +31,11 @@ intrusive corporate network:">
 
 
-
+
 
+"Ú¯ÙÙØ§ÙÛ Ú©Û ÙÛÛ Ù¹ÙØ± Ú©Ù Ø§Ø³ØªØ¹ÙØ§Ù Ú©Ø±ØªÛ ÛÙØ¦Û 
Ø§Ø³ÙØ§Ø¯ Ú©Û ØªØµØ¯ÛÙ Ú©Ø±ÛÚº(Ù¹ÙØ± Ø¯Ø±Ú©Ø§Ø± ÛÛ)Û">
 
+"Ø§Ø³ Ø§ÙØªØ®Ø§Ø¨ Ú©Û ÙÛÛ Ù¹ÙØ± Ú©Ø§ Ø§ÙØ³Ù¹Ø§Ù ÛÙÙØ§ Ø§ÙØ± 
ÚØ§ÙÙ ÛÙÙØ§ Ø¶Ø±ÙØ±Û ÛÛÛ">
 
 
@@ -50,7 +49,7 @@ intrusive corporate network:">
 
 
-
+
 
 
 
-
+
 
 
@@ -84,14 +83,14 @@ looked at.  Mouseover the options for further details:">
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 

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

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

2018-11-15 Thread translation

commit 465f78634084def9ad73ac4dbab7093d8cd88ca9
Author: Translation commit bot 
Date:   Thu Nov 15 16:45:34 2018 +

Update translations for exoneratorproperties
---
 ur/exonerator.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ur/exonerator.properties b/ur/exonerator.properties
index e43957a70..d31918bd9 100644
--- a/ur/exonerator.properties
+++ b/ur/exonerator.properties
@@ -37,8 +37,8 @@ technicaldetails.colheader.ip=IP address(es)
 technicaldetails.colheader.fingerprint=Identity fingerprint
 technicaldetails.colheader.nickname=Nickname
 technicaldetails.colheader.exit=Exit relay
-technicaldetails.nickname.unknown=Unknown
-technicaldetails.exit.unknown=Unknown
+technicaldetails.nickname.unknown=ÙØ¨Ø¹Ù
+technicaldetails.exit.unknown=ÙØ¨Ø¹Ù
 technicaldetails.exit.yes=Ø¬Û ÛØ§Úº
 technicaldetails.exit.no=ÙÛÛÚº
 permanentlink.heading=Permanent link

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

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

2018-11-15 Thread translation

commit 3d283767c69e418ab247ecd7827e13d2cd618197
Author: Translation commit bot 
Date:   Thu Nov 15 18:49:23 2018 +

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

diff --git a/ar/ar.po b/ar/ar.po
index 29f1d63a5..fb0610e54 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-10-04 01:05+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-11-15 18:25+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

2018-11-15 Thread nickm

commit 22338d63c4e579801788727ca3e09fc15f931622
Merge: de55df026 7bf9c93ab
Author: Nick Mathewson 
Date:   Tue Oct 30 09:33:58 2018 -0400

Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

 changes/bug27741 |  5 +
 src/rust/protover/ffi.rs | 19 ---
 2 files changed, 9 insertions(+), 15 deletions(-)




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

[tor-commits] [tor/maint-0.3.5] Try to restore a proper fix for bug27740 in 0.3.5.

2018-11-15 Thread nickm

commit 632e0406595ade9da40317a777f438c43ea5b5f3
Author: Nick Mathewson 
Date:   Tue Oct 30 07:37:17 2018 -0400

Try to restore a proper fix for bug27740 in 0.3.5.

(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.)
---
 src/rust/protover/ffi.rs | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f17f30127..e29efd6df 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -65,12 +65,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



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

[tor-commits] [tor/release-0.3.5] remove now-unused "use" statement.

2018-11-15 Thread nickm

commit de55df0260a25ed26119174555a17c4b29657a90
Author: Nick Mathewson 
Date:   Tue Oct 30 09:28:10 2018 -0400

remove now-unused "use" statement.
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index e29efd6df..451bf4665 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



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

[tor-commits] [tor/maint-0.3.5] remove now-unused "use" statement.

2018-11-15 Thread nickm

commit de55df0260a25ed26119174555a17c4b29657a90
Author: Nick Mathewson 
Date:   Tue Oct 30 09:28:10 2018 -0400

remove now-unused "use" statement.
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index e29efd6df..451bf4665 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



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

[tor-commits] [tor/master] Try to restore a proper fix for bug27740 in 0.3.5.

2018-11-15 Thread nickm

commit 632e0406595ade9da40317a777f438c43ea5b5f3
Author: Nick Mathewson 
Date:   Tue Oct 30 07:37:17 2018 -0400

Try to restore a proper fix for bug27740 in 0.3.5.

(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.)
---
 src/rust/protover/ffi.rs | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f17f30127..e29efd6df 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -65,12 +65,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



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

[tor-commits] [tor/maint-0.3.5] Merge branch 'bug27740_035_fix' into maint-0.3.5

2018-11-15 Thread nickm

commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06
Merge: a9db07f32 22338d63c
Author: Nick Mathewson 
Date:   Thu Nov 15 16:11:06 2018 -0500

Merge branch 'bug27740_035_fix' into maint-0.3.5

 src/rust/protover/ffi.rs | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'bug27740_035_fix' into maint-0.3.5

2018-11-15 Thread nickm

commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06
Merge: a9db07f32 22338d63c
Author: Nick Mathewson 
Date:   Thu Nov 15 16:11:06 2018 -0500

Merge branch 'bug27740_035_fix' into maint-0.3.5

 src/rust/protover/ffi.rs | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)



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

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

2018-11-15 Thread nickm

commit 22338d63c4e579801788727ca3e09fc15f931622
Merge: de55df026 7bf9c93ab
Author: Nick Mathewson 
Date:   Tue Oct 30 09:33:58 2018 -0400

Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

 changes/bug27741 |  5 +
 src/rust/protover/ffi.rs | 19 ---
 2 files changed, 9 insertions(+), 15 deletions(-)




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

[tor-commits] [tor/master] remove now-unused "use" statement.

2018-11-15 Thread nickm

commit de55df0260a25ed26119174555a17c4b29657a90
Author: Nick Mathewson 
Date:   Tue Oct 30 09:28:10 2018 -0400

remove now-unused "use" statement.
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index e29efd6df..451bf4665 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



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

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

2018-11-15 Thread nickm

commit 22338d63c4e579801788727ca3e09fc15f931622
Merge: de55df026 7bf9c93ab
Author: Nick Mathewson 
Date:   Tue Oct 30 09:33:58 2018 -0400

Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix

 changes/bug27741 |  5 +
 src/rust/protover/ffi.rs | 19 ---
 2 files changed, 9 insertions(+), 15 deletions(-)




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

[tor-commits] [tor/release-0.3.5] Try to restore a proper fix for bug27740 in 0.3.5.

2018-11-15 Thread nickm

commit 632e0406595ade9da40317a777f438c43ea5b5f3
Author: Nick Mathewson 
Date:   Tue Oct 30 07:37:17 2018 -0400

Try to restore a proper fix for bug27740 in 0.3.5.

(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.)
---
 src/rust/protover/ffi.rs | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f17f30127..e29efd6df 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -65,12 +65,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-15 Thread nickm

commit 31cc0d2c0bce11dbddec9e5869fdb2ce1acc001d
Merge: 92f71b8e8 4b6b58ed8
Author: Nick Mathewson 
Date:   Thu Nov 15 16:11:29 2018 -0500

Merge branch 'maint-0.3.5'

 src/rust/protover/ffi.rs | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

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

1 2 3 4 >

1 - 100 of 354 matches

Mail list logo