September 2020 - tor-commits - lists.torproject.org

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit 9a176a47e58d43938ad6ca043227bddb714d85a0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 22:45:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- pt_BR/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index 318ac21dd1..19b35246a6 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -47,8 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "O HTTPS Everywhere percebeu que você estava navegando para uma página não HTTPS e tentou enviar você para a versão HTTPS. A versão HTTPS não está disponível. O mais provável é que este site não suporte HTTPS, mas também é possível que um invasor esteja bloqueando a versão HTTPS. Se você desejar visualizar a versão não criptografada desta página, ainda poderá desativá-la desativando a opção "Criptografar todos os sites qualificados" (EASE) na sua extensão HTTPS Everywhere. Esteja ciente de que desabilitar essa opção pode deixar seu navegador vulnerável a ataques de downgrade com base na rede nos sites que você visita."> <!ENTITY https-everywhere.cancel.he_blocking_network "Ataques inferiores e básico de rede"> -<!ENTITY https-everywhere.cancel.copy_url "Copy URL"> -<!ENTITY https-everywhere.cancel.copied_url "Copied to Clipboard"> +<!ENTITY https-everywhere.cancel.copy_url "Copiar URL"> +<!ENTITY https-everywhere.cancel.copied_url "Copiado para Clipboard"> <!ENTITY https-everywhere.cancel.open_page "Abrir página insegura"> <!ENTITY https-everywhere.cancel.http_once "Abrir página insegura apenas para esta sessão">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit e73356791f9f77888aa4a89ecff70ce97a61abed Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 21:16:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he.po b/he.po index b49f3eb388..719d14fe2c 100644 --- a/he.po +++ b/he.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-10 10:11+0000\n" -"Last-Translator: ION\n" +"PO-Revision-Date: 2020-09-10 20:56+0000\n" +"Last-Translator: Omer I.S.\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit f06798cf1d9176a25aa86cf2f06db5b67cb9a710 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 21:15:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- he.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he.po b/he.po index 3828e75da1..36bf5b001a 100644 --- a/he.po +++ b/he.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-10 10:11+0000\n" -"Last-Translator: ION\n" +"PO-Revision-Date: 2020-09-10 20:56+0000\n" +"Last-Translator: Omer I.S.\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -504,7 +504,7 @@ msgid "" "${filename}\n" "\n" "Renaming it to Passwords.kdbx would allow KeePassXC to open it automatically in the future." -msgstr "" +msgstr "<big>Do you want to rename your KeePassXC database?</big>\n\nYou have a KeePassXC database in your Persistent folder:\n\n${filename}\n\nRenaming it to Passwords.kdbx would allow KeePassXC to open it automatically in the future." #: config/chroot_local-includes/usr/local/bin/keepassxc:23 msgid "Rename"

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit e1cea2f1573c0cf0b5e2e6a5352fe6dea4f54f7e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 19:15:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- lt/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index b76a0197c8..8a7bd394e4 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -47,6 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer ""> <!ENTITY https-everywhere.cancel.he_blocking_network ""> +<!ENTITY https-everywhere.cancel.copy_url ""> +<!ENTITY https-everywhere.cancel.copied_url "Nukopijuota į iškarpinę"> <!ENTITY https-everywhere.cancel.open_page "Atverti nesaugų puslapį"> <!ENTITY https-everywhere.cancel.http_once "Atverti nesaugų puslapį tik šiam seansui">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit bcb8c2d9cf411850fd6d677601a396359ad1d68a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 19:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- lt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 269d09723b..830ed3e1d9 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -47,8 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere pastebėjo, kad ketinote naršyti į ne HTTPS puslapį ir, vietoj to, bandė jus nukreipti į HTTPS versiją. HTTPS versija yra neprieinama. Greičiausiai, ši svetainė nepalaiko HTTPS, tačiau taip pat gali būti, kad užpuolikas blokuoja HTTPS versiją. Jeigu vis dar norėtumėte matyti nešifruotą šio puslapio versiją, galite tai atlikti, savo HTTPS Everywhere priede išjungę parametrą "Šifruoti visas galimas svetaines" (EASE). Turėkite omenyje, kad šio parametro išjungimas, svetainėse, kuriose lankysitės gali padaryti jūsų naršyklę pažeidžiamą tinklu pagrįstoms sendinimo atakoms."> <!ENTITY https-everywhere.cancel.he_blocking_network "tinklu pagrįstos sendinimo atakos"> -<!ENTITY https-everywhere.cancel.copy_url "Copy URL"> -<!ENTITY https-everywhere.cancel.copied_url "Copied to Clipboard"> +<!ENTITY https-everywhere.cancel.copy_url "Kopijuoti URL"> +<!ENTITY https-everywhere.cancel.copied_url "Nukopijuota į iškarpinę"> <!ENTITY https-everywhere.cancel.open_page "Atverti nesaugų puslapį"> <!ENTITY https-everywhere.cancel.http_once "Atverti nesaugų puslapį tik šiam seansui">

1 0

[tor-browser-build/master] Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit d40f58678503123fcbacbbbcd6c19b37e167ab86 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 5 11:25:23 2020 +0000 Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems --- projects/clang-source/build | 7 ++ projects/clang-source/config | 2 + projects/clang-source/no-seh.patch | 145 +++++++++++++++++++++++++++++++++++++ projects/firefox/build | 2 + projects/mingw-w64/build | 4 +- rbm.conf | 4 +- 6 files changed, 161 insertions(+), 3 deletions(-) diff --git a/projects/clang-source/build b/projects/clang-source/build index 860b8e4..d94fcbe 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -19,6 +19,13 @@ mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra mv libcxx-[% c("version") %].src llvm/projects/libcxx mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi mv lld-[% c("version") %].src llvm/tools/lld +[% IF c("var/windows-i686") %] + # mingw-w64 does not support SEH on 32bit systems. Make it possible to + # explicitly disable it. + cd llvm/tools + patch -p1 < $rootdir/no-seh.patch + cd ../../ +[% END %] mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ diff --git a/projects/clang-source/config b/projects/clang-source/config index d0ae90c..8adb18e 100644 --- a/projects/clang-source/config +++ b/projects/clang-source/config @@ -30,3 +30,5 @@ input_files: name: libunwind file_gpg_id: 1 - filename: 43909.patch + - filename: no-seh.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/clang-source/no-seh.patch b/projects/clang-source/no-seh.patch new file mode 100644 index 0000000..1a52e40 --- /dev/null +++ b/projects/clang-source/no-seh.patch @@ -0,0 +1,145 @@ +From 38cbe873d45cf3c881ef4113b48193edfd418f43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> +Date: Mon, 27 Jul 2020 23:44:41 +0300 +Subject: [PATCH] Implement the --no-seh flag + +Previously this flag was just ignored. If set, set the +IMAGE_DLL_CHARACTERISTICS_NO_SEH bit, regardless of the normal safeSEH +machinery. + +In mingw configurations, the safeSEH bit might not be set in e.g. object +files built from handwritten assembly, making it impossible to use the +normal safeseh flag. As mingw setups don't generally use SEH on 32 bit +x86 at all, it should be fine to set that flag bit though - hook up +the existing GNU ld flag for controlling that. + +Differential Revision: https://reviews.llvm.org/D84701 + +diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h +index 4b62cd05f4f..17ea0f8bcab 100644 +--- a/lld/COFF/Config.h ++++ b/lld/COFF/Config.h +@@ -135,6 +135,7 @@ struct Configuration { + bool safeSEH = false; + Symbol *sehTable = nullptr; + Symbol *sehCount = nullptr; ++ bool noSEH = false; + + // Used for /opt:lldlto=N + unsigned ltoo = 2; +diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp +index 15d6fb5121a..b569df07601 100644 +--- a/lld/COFF/Driver.cpp ++++ b/lld/COFF/Driver.cpp +@@ -1574,9 +1574,10 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) { + config->wordsize = config->is64() ? 8 : 4; + + // Handle /safeseh, x86 only, on by default, except for mingw. +- if (config->machine == I386 && +- args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw)) +- config->safeSEH = true; ++ if (config->machine == I386) { ++ config->safeSEH = args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw); ++ config->noSEH = args.hasArg(OPT_noseh); ++ } + + // Handle /functionpadmin + for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt)) +diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td +index 024b7be8f78..c7e2a5ea57e 100644 +--- a/lld/COFF/Options.td ++++ b/lld/COFF/Options.td +@@ -171,6 +171,7 @@ def include_optional : Joined<["/", "-", "/?", "-?"], "includeoptional:">, + HelpText<"Add symbol as undefined, but allow it to remain undefined">; + def kill_at : F<"kill-at">; + def lldmingw : F<"lldmingw">; ++def noseh : F<"noseh">; + def output_def : Joined<["/", "-", "/?", "-?"], "output-def:">; + def pdb_source_path : P<"pdbsourcepath", + "Base path used to make relative source file path absolute in PDB">; +diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp +index 5736281958f..aead781d38b 100644 +--- a/lld/COFF/Writer.cpp ++++ b/lld/COFF/Writer.cpp +@@ -1352,7 +1352,7 @@ template <typename PEHeaderTy> void Writer::writeHeader() { + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF; + if (config->integrityCheck) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY; +- if (setNoSEHCharacteristic) ++ if (setNoSEHCharacteristic || config->noSEH) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH; + if (config->terminalServerAware) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE; +diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp +index be1b757e45b..1d292817cfb 100644 +--- a/lld/MinGW/Driver.cpp ++++ b/lld/MinGW/Driver.cpp +@@ -249,6 +249,8 @@ bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) { + add("-kill-at"); + if (args.hasArg(OPT_appcontainer)) + add("-appcontainer"); ++ if (args.hasArg(OPT_no_seh)) ++ add("-noseh"); + + if (args.getLastArgValue(OPT_m) != "thumb2pe" && + args.getLastArgValue(OPT_m) != "arm64pe" && !args.hasArg(OPT_dynamicbase)) +diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td +index 86400433d04..931cf264837 100644 +--- a/lld/MinGW/Options.td ++++ b/lld/MinGW/Options.td +@@ -45,6 +45,7 @@ def minor_subsystem_version_eq: Joined<["--"], "minor-subsystem-version=">, + Alias<minor_subsystem_version>; + def no_insert_timestamp: F<"no-insert-timestamp">, + HelpText<"Don't include PE header timestamp">; ++def no_seh: F<"no-seh">, HelpText<"Set the 'no SEH' flag in the executable">; + def no_whole_archive: F<"no-whole-archive">, + HelpText<"No longer include all object files for following archives">; + def large_address_aware: Flag<["--"], "large-address-aware">, +@@ -104,7 +105,6 @@ def: Flag<["--"], "full-shutdown">; + def: F<"high-entropy-va">; + def: S<"major-image-version">; + def: S<"minor-image-version">; +-def: F<"no-seh">; + def: F<"nxcompat">; + def: F<"pic-executable">; + def: S<"plugin">; +diff --git a/lld/test/COFF/noseh.s b/lld/test/COFF/noseh.s +new file mode 100644 +index 00000000000..44295228622 +--- /dev/null ++++ b/lld/test/COFF/noseh.s +@@ -0,0 +1,19 @@ ++# REQUIRES: x86 ++# RUN: llvm-mc -triple i686-w64-mingw32 %s -filetype=obj -o %t.obj ++# RUN: lld-link -lldmingw %t.obj -out:%t.exe -entry:main ++# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s --check-prefix=DEFAULT ++# RUN: lld-link -lldmingw %t.obj -out:%t.noseh.exe -entry:main -noseh ++# RUN: llvm-readobj --file-headers %t.noseh.exe | FileCheck %s --check-prefix=NOSEH ++ ++# DEFAULT: Characteristics [ ++# DEFAULT-NOT: IMAGE_DLL_CHARACTERISTICS_NO_SEH ++# DEFAULT: ] ++ ++# NOSEH: Characteristics [ ++# NOSEH: IMAGE_DLL_CHARACTERISTICS_NO_SEH ++# NOSEH: ] ++ ++ .text ++ .globl _main ++_main: ++ ret +diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test +index b8bc2ddea8a..1d53205927b 100644 +--- a/lld/test/MinGW/driver.test ++++ b/lld/test/MinGW/driver.test +@@ -204,3 +204,7 @@ APPCONTAINER: -appcontainer + RUN: ld.lld -### -m i386pep foo.o -delayload user32.dll --delayload shell32.dll | FileCheck -check-prefix DELAYLOAD %s + RUN: ld.lld -### -m i386pep foo.o -delayload=user32.dll --delayload=shell32.dll | FileCheck -check-prefix DELAYLOAD %s + DELAYLOAD: -delayload:user32.dll -delayload:shell32.dll ++ ++RUN: ld.lld -### -m i386pe foo.o -no-seh | FileCheck -check-prefix NOSEH %s ++RUN: ld.lld -### -m i386pe foo.o --no-seh | FileCheck -check-prefix NOSEH %s ++NOSEH: -noseh +-- +2.28.0 + diff --git a/projects/firefox/build b/projects/firefox/build index d3c7139..63be146 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -77,6 +77,8 @@ fi # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" patch -p1 < $rootdir/nsis-uninstall.patch + # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. + export LDFLAGS="[% c('var/flag_noSEH') %]" [% END -%] [% IF c("var/namecoin") %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index c5fcda6..155c531 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -24,7 +24,7 @@ cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" # Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc @@ -40,7 +40,7 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install diff --git a/rbm.conf b/rbm.conf index b5dff53..9ee4f18 100644 --- a/rbm.conf +++ b/rbm.conf @@ -368,6 +368,8 @@ targets: windows-i686: 1 windows-x86_64: 0 osname: windows-i686 + # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. + flag_noSEH: '-Wl,--no-seh' windows: var: windows: 1 @@ -376,7 +378,7 @@ targets: arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' - LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_noSEH") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1

1 0

[tor-browser-build/master] Bug 40077: Don't pass --no-insert-timestamp when building Firefox
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit f6e87613d6f36fded0674ad91e3937c7403bee26 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 5 15:00:56 2020 +0000 Bug 40077: Don't pass --no-insert-timestamp when building Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1612423 does that for us now when using mingw-w64. --- projects/firefox/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 4e1a077..d3c7139 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -77,8 +77,6 @@ fi # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" patch -p1 < $rootdir/nsis-uninstall.patch - # Make sure we link without inserting timestamps in general. - export LDFLAGS="-Wl,--no-insert-timestamp" [% END -%] [% IF c("var/namecoin") %]

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit ea819cb7a62f12c6478a3195694cfa5dcc64c27b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 16:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 1c36493ad7..975c58fb12 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-10 15:43+0000\n" +"PO-Revision-Date: 2020-09-10 16:10+0000\n" "Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -313,7 +313,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "Mekanisme penyaluran \"HTTPS\" membagikan jembatan melalui situs ini. Untuk mendapatkan\njembatan, kunjungi %sbridges.torproject.org%s, pilih opsi pilihan Anda, dan\nselesaikan CAPTCHA." #: bridgedb/strings.py:119 #, python-format @@ -323,7 +323,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "Mekanisme penyaluran \"Moat\" adalah bagian dari Tor Browser, memungkinan pengguna untuk\nmeminta jembatan langsung dari pengaturan Tor Browser. Untuk mendapatkan jembatan, buka\n%spengaturan Tor%s pada Tor Browser Anda, klik \"request a new bridge\", selesaikan\nCAPTCHA dan Tor Browser akan secara otomatis menambahkan jembatan baru Anda." #: bridgedb/strings.py:125 #, python-format @@ -331,11 +331,11 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "" +msgstr "Pengguna dapat meminta jembatan melalui mekanisme penyaluran \"Surel\" dengan mengirim sebuah\nsurel ke %sbridges(a)torproject.org%s dan menulis \"get transport obfs4\" pada\nisi surel." #: bridgedb/strings.py:129 msgid "Reserved" -msgstr "" +msgstr "Telah Direservasi" #: bridgedb/strings.py:130 #, python-format @@ -346,7 +346,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "BridgeDB memiliki sejumlah kecil jembatan yang tidak disalurkan secara otomatis. Sebagai gantinya, kami mereservasi jembatan-jembatan ini untuk penyaluran secara manual\ndan membagikannya kepada LSM dan organisasi serta individu lainnya yang membutuhkan jembatan. Jembatan yang disalurkan melalui mekanisme \"Telah Direservasi\" mungkin tidak\nmendapatkan pengguna untuk waktu yang lama. Harap catat bahwa mekanisme penyaluran \"Telah Direservasi\" disebut sebagai\n\"Unallocated\" di berkas %sbridge pool assignment%s." #: bridgedb/strings.py:137 msgid "None" @@ -359,7 +359,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "Jembatan yang memiliki mekanisme penyaluran \"Tidak Ada\" tidak disalurkan oleh BridgeDB.\nMembagikan jembatan dengan mekanisme penyaluran ini adalah tanggung jawab operator jembatan.\nHarap catat bahwa pada Relay Search, jembatan yang baru saja mulai beroperasi akan menampilkan mekanisme penyaluran \"Tidak Ada\" selama kira-kira satu hari. Mohon bersabar sedikit, dan\nmekanisme penyaluran yang ditampilkan akan berubah menjadi yang mekanisme penyaluran jembatan tersebut yang sebenarnya.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:" @@ -394,23 +394,23 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "Pertama, Anda perlu %smengunduh Tor Browser%s. Panduan Pengguna Tor Browser kami menjelaskan bagaimana Anda dapat menambahkan jembatan Anda ke Tor Browser. Apabila Anda menggunakan Windows, Linux atau OS X, %sklik disini%s untuk mempelajari lebih lanjut. Apabila Anda menggunakan Android, %sklik disini%s." #: bridgedb/strings.py:166 msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "Tambahkan jembatan-jembatan berikut ke Tor Browser Anda dengan membuka pengaturan peramban Anda, klik \"Tor\", dan tambahkan jembatan-jembatan ke bidang \"Provide a bridge\"." #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(Minta jembatan Tor yang tidak disamarkan)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "(Minta jembatan IPv6)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(Minta jembatan obfs4 yang disamarkan)"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40078'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit a7e90a70837f085cdca27245f96fe4a448e8d929 Merge: dc1c703 68c652e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:54:02 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40078' projects/android-toolchain/build | 8 +++++--- projects/android-toolchain/config | 24 ++++++++++++++---------- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-)

1 0

[tor-browser-build/master] Bug 40078: Include Gradle 6.5.1 and use it for fenix
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 68c652e12775f4c473866874e9f6e6be273132db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 7 08:16:01 2020 +0000 Bug 40078: Include Gradle 6.5.1 and use it for fenix --- projects/android-toolchain/build | 8 +++++--- projects/android-toolchain/config | 24 ++++++++++++++---------- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 74a49f1..a0d5ee8 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -15,11 +15,13 @@ unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME -unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # GeckoView is still using an older Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # application-services is using a comparatively new Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME +# Fenix switched to a fairly recent Gradle, add it as well. +unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 9fd997d..b8ef898 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,16 +19,17 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle_version_new: 6.3 - gradle_version: 5.6.4 - gradle_version_old: 5.1.1 + gradle651: 6.5.1 + gradle63: 6.3 + gradle564: 5.6.4 + gradle511: 5.1.1 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -55,12 +56,15 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip - name: gradle_bin_new + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip + name: gradle651 + sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip + name: gradle63 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip - name: gradle_bin + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip + name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip - name: gradle_bin_old + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip + name: gradle511 sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 diff --git a/projects/fenix/build b/projects/fenix/build index 0cde15d..806044b 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -31,7 +31,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ [% IF c("var/fetch_gradle_dependencies") %] - gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 @@ -45,7 +45,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ # not only for geckoview-beta. cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]

1 0