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

2019-08-21 Thread translation 
commit 91aa2f7767af3ecdd96e46b9c9e7e320d815b9f0
Author: Translation commit bot 
Date:   Wed Aug 21 10:31:24 2019 +

Update translations for support-portal_completed
---
 contents+de.po| 112 ---
 contents+es.po| 116 +++--
 contents+fr.po| 109 +-
 contents+is.po| 108 -
 contents+ka.po|  98 +
 contents+pl.po| 106 -
 contents+pt-BR.po | 117 +++---
 contents+tr.po| 108 +++--
 contents.pot  | 102 +++
 9 files changed, 560 insertions(+), 416 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index d0c726a5d..f521a1daf 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,19 +1,20 @@
 # Translators:
 # jk , 2019
 # try once, 2019
+# Not AName , 2019
 # erinm, 2019
 # Marcel Haring , 2019
 # Emma Peel, 2019
-# Not AName , 2019
 # Curtis Baltimore , 2019
+# c8faa9c4b9d81319c5c2fd62ae3a9956, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 17:41+CET\n"
+"POT-Creation-Date: 2019-08-21 12:22+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: c8faa9c4b9d81319c5c2fd62ae3a9956, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,15 +278,11 @@ msgstr ""
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
-#: https//support.torproject.org/misc/misc-13/
-#: (content/misc/misc-13/contents+en.lrquestion.title)
 msgid "Can I use a VPN with Tor?"
 msgstr "Kann ich ein VPN mit Tor verwenden?"
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.description)
-#: https//support.torproject.org/misc/misc-13/
-#: (content/misc/misc-13/contents+en.lrquestion.description)
 msgid ""
 "Generally speaking, we don't recommend using a VPN with Tor unless you're an"
 " advanced user who knows how to configure both in a way that doesn't "
@@ -297,8 +294,6 @@ msgstr ""
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.description)
-#: https//support.torproject.org/misc/misc-13/
-#: (content/misc/misc-13/contents+en.lrquestion.description)
 msgid ""
 "You can find more detailed information about Tor + VPN at https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>our "
@@ -630,12 +625,8 @@ msgstr ""
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-"
-"US.exe.asc Downloads\torbrowser-win64-install-8.5.4_en-US.exe"
+"US.exe.asc Downloads\torbrowser-install-win64-8.5.4_en-US.exe"
 msgstr ""
-"gpgv --keyring .\n"
-"or.keyring Downloads\n"
-"orbrowser-install-win64-8.5.4_de-US.exe.asc Downloads\n"
-"orbrowser-win64-install-8.5.4_de-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -6135,12 +6126,9 @@ msgstr ""
 #: https//support.torproject.org/misc/misc-12/
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
-"For sharing files through Tor, https://onionshare.org/\;>OnionShare is a good option."
 msgstr ""
-"Um Dateien über Tor zu teilen, ist https://onionshare.org/\;>OnionShare eine gute "
-"Möglichkeit."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -6425,67 +6413,91 @@ msgid ""
 "into Tor Browser itself."
 msgstr "Viele Funktionen von Vidalia wurden in Tor Browser integriert."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor Browser herunterladen"
+
+#: lego/templates/footer.html:10 templates/footer.html:10
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+"Lade Tor Browser herunter, um echtes privates Surfen ohne Verfolgung, "
+"Überwachung oder Zensur zu erleben."
+
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Unsere Mission:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 "

[tor-commits] [tor-browser-build/master] Bug 30323: Adapt macOS toolchain for esr68

2019-08-21 Thread boklm 
commit 1877dbbdf499e51beb6dd5be2d53e74f57428130
Author: Georg Koppen 
Date:   Mon Aug 19 18:18:22 2019 +

Bug 30323: Adapt macOS toolchain for esr68

There are already included some simplifications as done in
https://bugzilla.mozilla.org/show_bug.cgi?id=1513798 but not all of them
as some break our current setup. This needs to get investigated in a
different bug.
---
 projects/firefox/build| 48 +++
 projects/firefox/config   |  1 -
 projects/firefox/mozconfig-osx-x86_64 | 15 +--
 projects/macosx-toolchain/build   |  7 ++---
 projects/macosx-toolchain/config  |  4 +--
 5 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 18db7b9..5d4d2a3 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -52,24 +52,23 @@ EOF
   wine wineboot -i
 [% END -%]
 
+mkdir -p /var/tmp/dist
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/python') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %]
+export 
PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH"
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
+export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
+
 [% IF c("var/linux") %]
-  mkdir -p /var/tmp/dist
   tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/python') %]
-  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %]
-  export 
PATH="/var/tmp/dist/binutils/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH"
+  export PATH="/var/tmp/dist/binutils/bin:$PATH"
   # Use clang for everything on Linux now.
-  tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
-  export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
   export PATH="/var/tmp/dist/clang/bin:$PATH"
 [% END -%]
 
-mkdir -p /var/tmp/dist
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]
-export 
PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:$PATH"
-
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
 [% IF c("var/osx") %]
@@ -226,27 +225,22 @@ cp -p config/createprecomplete.py $MARTOOLS/
 cp -p tools/update-packaging/*.sh $MARTOOLS/
 cp -p obj-*/dist/host/bin/mar $MARTOOLS/
 cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
-[% IF c("var/linux") %]
+[% IF c("var/linux") || c("var/osx") %]
   cp -p obj-*/dist/bin/signmar $MARTOOLS/
   cp -p obj-*/dist/bin/certutil $MARTOOLS/
   cp -p obj-*/dist/bin/modutil $MARTOOLS/
   cp -p obj-*/dist/bin/pk12util $MARTOOLS/
   cp -p obj-*/dist/bin/shlibsign $MARTOOLS/
-  NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so 
libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
-  NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
+  [% IF c("var/linux") %]
+NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so 
libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
+NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
+  [% ELSE %]
+NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib 
libnssdbm3.dylib libsoftokn3.dylib"
+# No NSPR_LIBS for macOS
+NSPR_LIBS=""
+  [% END %]
   for LIB in $NSS_LIBS $NSPR_LIBS; do
-  cp -p obj-*/dist/bin/$LIB $MARTOOLS/
-  done
-[% END %]
-[% IF c("var/osx") %]
-  cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
-  cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/
-  cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/
-  cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/
-  cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign 
$MARTOOLS/
-  NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib 
libnssdbm3.dylib libsoftokn3.dylib"
-  for LIB in $NSS_LIBS; do
-  cp -p obj-*/dist/bin/$LIB $MARTOOLS/
+cp -p obj-*/dist/bin/$LIB $MARTOOLS/
   done
 [% END %]
 [% IF c("var/windows") %]
diff --git a/projects/firefox/config b/projects/firefox/config
index a481815..a1073d5 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -152,7 +152,6 @@ input_files:
 name: python
   - project: clang
 name: clang
-enable: '[% c("var/linux") %]'
   - project: fxc2
 name: fxc2
 enable: '[% c("var/windows") %]'
diff --git a/projects/firefox/mozconfig-osx-x86_64 
b/projects/firefox/mozconfig-osx-x86_64
index a87bf35..5d82d12 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++

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

2019-08-21 Thread translation 
commit 91b72bf8dac78af2f30acd19f3e72e682e7ae74f
Author: Translation commit bot 
Date:   Wed Aug 21 08:45:55 2019 +

Update translations for https_everywhere
---
 km/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd
index 3e5b40ffd..e642dfbfc 100644
--- a/km/https-everywhere.dtd
+++ b/km/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [metrics-web/master] Fix links on CollecTor page, again.

2019-08-21 Thread karsten 
commit c3d9c42d0743e9a15c117ab778802fbf7afc3ff1
Author: Karsten Loesing 
Date:   Wed Aug 21 08:33:05 2019 +0200

Fix links on CollecTor page, again.

Include metrics-lib-*-thin.jar rather than metrics-lib-*.jar.

Re-closes #24792.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d8c0c07..038a82f 100644
--- a/build.xml
+++ b/build.xml
@@ -83,7 +83,7 @@
 
 
 
-
+
 
 
 

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

<    1   2