- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 23 Mar '19

23 Mar '19

commit 91c24ad530c896d7bab1e1f485ac092512523243 Merge: 22e72eeaa 8bc3ac6a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 08:44:44 2019 -0400 Merge branch 'maint-0.4.0' "ours" to avoid version bump

1 0

[tor/master] Bump to 0.4.0.3-alpha-dev
by nickm＠torproject.org 23 Mar '19

23 Mar '19

commit 8bc3ac6a84a11adb728f4ce49f23414c27fe84cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 08:44:36 2019 -0400 Bump to 0.4.0.3-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c5e1b6d56..17a4d9680 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha]) +AC_INIT([tor],[0.4.0.3-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-21"], # for 0.4.0.3-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2a01308f7..0d0d4f493 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.3-alpha" +!define VERSION "0.4.0.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a667099e9..d3441610b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.3-alpha" +#define VERSION "0.4.0.3-alpha-dev"

1 0

[tor/release-0.4.0] Bump to 0.4.0.3-alpha-dev
by nickm＠torproject.org 23 Mar '19

23 Mar '19

commit 8bc3ac6a84a11adb728f4ce49f23414c27fe84cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 08:44:36 2019 -0400 Bump to 0.4.0.3-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c5e1b6d56..17a4d9680 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha]) +AC_INIT([tor],[0.4.0.3-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-21"], # for 0.4.0.3-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2a01308f7..0d0d4f493 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.3-alpha" +!define VERSION "0.4.0.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a667099e9..d3441610b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.3-alpha" +#define VERSION "0.4.0.3-alpha-dev"

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit 32784e43ff919a1b967efc7611b67f411d82f551 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 12:15:41 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/pt_BR/LC_MESSAGES/messages.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 078e08667..f520e82e4 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -1385,7 +1385,7 @@ msgstr "Será que posso doar quando estiver usando o Navegador Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:298 msgid "Yes! In our testing, donation works via Tor Browser." -msgstr "Sim! Em nossos testes, a doação funciona através do navegador Tor." +msgstr "Sim! Em nossos testes, a doação funciona com o Navegador Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:300 msgid "" @@ -1731,7 +1731,7 @@ msgid "" "class=\"email\">giving(at)torproject.org." msgstr "" "Se você quiser que a sua doação seja reembolsada, por favor nos avise por " -"e-mail giving(at)torproject.org." +"e-mail: giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:464 msgid "" @@ -1793,8 +1793,8 @@ msgid "" "by their employees." msgstr "" "Sim! Muitas empresas - como o Google, Microsoft, eBay, PayPal, Apple, " -"Verizon, Red Hat, universidades e outros - corresponderão às doações feitas " -"por seus funcionários." +"Verizon, Red Hat, universidades e outros - duplicarão as doações feitas por " +"seus funcionários." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:502 msgid "" @@ -1813,8 +1813,9 @@ msgid "" "If your company isn't currently set up to match donations to the Tor " "Project, we would be happy to help with the paperwork." msgstr "" -"Se a sua empresa não está atualmente configurada para corresponder as " -"doações ao Projeto Tor, ficaremos felizes em ajudar com a sua papelada." +"Se, atualmente, a sua empresa não estiver preparada para duplicar as doações" +" (financiamento misto) ao Projeto Tor, ficaremos felizes em ajudar com a sua" +" documentação." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:506 msgid "" @@ -1931,9 +1932,9 @@ msgid "" "especially useful for us, please mail giving(at)torproject.org." msgstr "" -"Mas, se você quiser fazer uma doação de hardware na qual você acha que " -"poderá ser especialmente útil para nós, por favor, enviem-nos um email para " -"giving(at)torproject.org." +"Mas, se você quiser fazer uma doação de hardware que você acha que poderá " +"ser especialmente útil para nós, por favor, enviem-nos um email para giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:580 msgid "Can I donate my time?"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit e6243ba6382ff1915fc2669b4f6e67646a58d9ef Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 12:15:35 2019 +0000 Update translations for donatepages-messagespot --- locale/pt_BR/LC_MESSAGES/messages.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 078e08667..f520e82e4 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -1385,7 +1385,7 @@ msgstr "Será que posso doar quando estiver usando o Navegador Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:298 msgid "Yes! In our testing, donation works via Tor Browser." -msgstr "Sim! Em nossos testes, a doação funciona através do navegador Tor." +msgstr "Sim! Em nossos testes, a doação funciona com o Navegador Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:300 msgid "" @@ -1731,7 +1731,7 @@ msgid "" "class=\"email\">giving(at)torproject.org." msgstr "" "Se você quiser que a sua doação seja reembolsada, por favor nos avise por " -"e-mail giving(at)torproject.org." +"e-mail: giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:464 msgid "" @@ -1793,8 +1793,8 @@ msgid "" "by their employees." msgstr "" "Sim! Muitas empresas - como o Google, Microsoft, eBay, PayPal, Apple, " -"Verizon, Red Hat, universidades e outros - corresponderão às doações feitas " -"por seus funcionários." +"Verizon, Red Hat, universidades e outros - duplicarão as doações feitas por " +"seus funcionários." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:502 msgid "" @@ -1813,8 +1813,9 @@ msgid "" "If your company isn't currently set up to match donations to the Tor " "Project, we would be happy to help with the paperwork." msgstr "" -"Se a sua empresa não está atualmente configurada para corresponder as " -"doações ao Projeto Tor, ficaremos felizes em ajudar com a sua papelada." +"Se, atualmente, a sua empresa não estiver preparada para duplicar as doações" +" (financiamento misto) ao Projeto Tor, ficaremos felizes em ajudar com a sua" +" documentação." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:506 msgid "" @@ -1931,9 +1932,9 @@ msgid "" "especially useful for us, please mail giving(at)torproject.org." msgstr "" -"Mas, se você quiser fazer uma doação de hardware na qual você acha que " -"poderá ser especialmente útil para nós, por favor, enviem-nos um email para " -"giving(at)torproject.org." +"Mas, se você quiser fazer uma doação de hardware que você acha que poderá " +"ser especialmente útil para nós, por favor, enviem-nos um email para giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:580 msgid "Can I donate my time?"

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit 0c024749124db4a49c89a890d650c493b150c17c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 11:45:42 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/pt_BR/LC_MESSAGES/messages.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 01ac5700e..078e08667 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -788,7 +788,7 @@ msgstr "Processando a sua Doação - Tor" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:44 msgid "Processing Donation. Please Wait..." -msgstr "Processando a sua Doação - Por Favor Aguarde..." +msgstr "Processando a sua doação - Por Favor Aguarde..." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:25 msgid "" @@ -1784,7 +1784,7 @@ msgstr "Sim" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:496 msgid "Does Tor Project accept matching donations?" -msgstr "O Projeto Tor aceita doações correspondentes?" +msgstr "O Projeto Tor aceita doações duplicadas (financiamento misto)?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:500 msgid "" @@ -1859,8 +1859,9 @@ msgid "" "href=\"https://donate.torproject.org\">donation page</a>." msgstr "" "Uma variedade de presentes de agradecimentos para pessoas doadoras, " -"incluindo camisetas, moleton de capuz e adesivos, são apresentados na nossa " -"página principal de <a href=\"https://donate.torproject.org\">doações</a>." +"incluindo camisetas, moleton de capuz e adesivos, são apresentados na nossa" +" de <a href=\"https://donate.torproject.org\">página de " +"doações</a>principal ." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:534 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit eb96828a996f953226511324c1f04cea73db4786 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 11:45:35 2019 +0000 Update translations for donatepages-messagespot --- locale/pt_BR/LC_MESSAGES/messages.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 01ac5700e..078e08667 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -788,7 +788,7 @@ msgstr "Processando a sua Doação - Tor" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:44 msgid "Processing Donation. Please Wait..." -msgstr "Processando a sua Doação - Por Favor Aguarde..." +msgstr "Processando a sua doação - Por Favor Aguarde..." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:25 msgid "" @@ -1784,7 +1784,7 @@ msgstr "Sim" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:496 msgid "Does Tor Project accept matching donations?" -msgstr "O Projeto Tor aceita doações correspondentes?" +msgstr "O Projeto Tor aceita doações duplicadas (financiamento misto)?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:500 msgid "" @@ -1859,8 +1859,9 @@ msgid "" "href=\"https://donate.torproject.org\">donation page</a>." msgstr "" "Uma variedade de presentes de agradecimentos para pessoas doadoras, " -"incluindo camisetas, moleton de capuz e adesivos, são apresentados na nossa " -"página principal de <a href=\"https://donate.torproject.org\">doações</a>." +"incluindo camisetas, moleton de capuz e adesivos, são apresentados na nossa" +" de <a href=\"https://donate.torproject.org\">página de " +"doações</a>principal ." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:534 msgid ""

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit f15828eaeef4eb23a9ca9182211ede628e21fd0e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 09:18:04 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+id.po | 24 ++++++++++++------------ contents+tr.po | 9 ++++++--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/contents+id.po b/contents+id.po index ba6e1c891..d0129ff9b 100644 --- a/contents+id.po +++ b/contents+id.po @@ -394,12 +394,12 @@ msgid "" "screen to configure a pluggable transport." msgstr "" "Layar pertama menanyakan jika akses ke jaringan Tor di blokir atau di sensor" -" pada koneksi anda. Jika anda tidak yakin hal ini menjadi kasus, pilih " -"\"No\". Jika anda mengetahui bahwa jaringan di sensor, atau anda mencoba dan" -" gagal terhubung dengan jaringan Tor dan tidak ada yang lain yang berhasil, " -"pilih \"yes\". Anda akan dibawa pada <a " -"href=\"/circumvention\">circumvention</a> layar untuk mengkonfigurasi " -"pluggable transport" +" pada koneksi Anda. Jika Anda tidak yakin hal ini adalah persoalannya, pilih" +" \"Tidak\". Jika anda mengetahui bahwa koneksi Anda disensor, atau Anda " +"telah mencoba dan gagal terhubung dengan jaringan Tor dan tidak ada solusi " +"lain yang berhasil, pilih \"Ya\". Anda akan dibawa pada layar <a " +"href=\"/circumvention\">pengelakan</a>untuk mengkonfigurasi pluggable " +"transport." #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -410,12 +410,12 @@ msgid "" "ask your network administrator for guidance. If your connection does not use" " a proxy, click “Continue”." msgstr "" -"Layar selanjutnya menanyakan jika koneksi anda menggunakan sebuah proxy. " -"Pada banyak kasus, hal ini tidak diperlukan. Biasanya anda akan mengetahui " -"jika anda perlu menjawab \"yes\", sebagaimana pada pengaturan yang " -"digunakan oleh browser yang lain pada sistem anda. Jika memungkinkan, " -"tanyakan pengelola jaringan untuk panduan. Jika koneksi tidak menggunakan " -"sebuah proksi, klik \"continue\"." +"Layar selanjutnya menanyakan jika koneksi Anda menggunakan sebuah proksi. " +"Pada banyak kasus, hal ini tidak diperlukan. Biasanya Anda akan mengetahui " +"jika Anda perlu menjawab \"Ya\", sebagaimana pada pengaturan yang digunakan" +" oleh peramban lain pada sistem anda. Jika memungkinkan, tanyakan pengelola " +"jaringan untuk panduan. Jika koneksi Anda tidak menggunakan sebuah proksi, " +"klik \"Lanjut\"." #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) diff --git a/contents+tr.po b/contents+tr.po index 2a021ae59..f4953996a 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1,11 +1,11 @@ # Translators: -# Emma Peel, 2018 # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019 # cenk y. <goncagul(a)national.shitposting.agency>, 2019 # Hasan Tayyar BESIK <tayyar.besik(a)gmail.com>, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 # ilkeryus <ilkeryus(a)gmail.com>, 2019 # erinm, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-22 10:16+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -487,12 +487,15 @@ msgid "" "* Visit [https://bridges.torproject.org/ bridges.torproject.org] and follow " "the instructions, or" msgstr "" +"* https://bridges.torproject.org/ adresine giderek yönergeleri izleyin" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "" "* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address." msgstr "" +"* bridges(a)torproject.org'a Gmail, Yahoo ya da Riseup aracılığıyla bir " +"e-posta atın." #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -600,7 +603,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) msgid "<table class=\"table table-striped\">" -msgstr "" +msgstr "<table class=\"table table-striped\">" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit 239dba869124a5f7b4b4cf21f7f1672796b7bb01 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 09:17:56 2019 +0000 Update translations for tbmanual-contentspot --- contents+id.po | 24 ++++++++++++------------ contents+tr.po | 9 ++++++--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/contents+id.po b/contents+id.po index ba6e1c891..d0129ff9b 100644 --- a/contents+id.po +++ b/contents+id.po @@ -394,12 +394,12 @@ msgid "" "screen to configure a pluggable transport." msgstr "" "Layar pertama menanyakan jika akses ke jaringan Tor di blokir atau di sensor" -" pada koneksi anda. Jika anda tidak yakin hal ini menjadi kasus, pilih " -"\"No\". Jika anda mengetahui bahwa jaringan di sensor, atau anda mencoba dan" -" gagal terhubung dengan jaringan Tor dan tidak ada yang lain yang berhasil, " -"pilih \"yes\". Anda akan dibawa pada <a " -"href=\"/circumvention\">circumvention</a> layar untuk mengkonfigurasi " -"pluggable transport" +" pada koneksi Anda. Jika Anda tidak yakin hal ini adalah persoalannya, pilih" +" \"Tidak\". Jika anda mengetahui bahwa koneksi Anda disensor, atau Anda " +"telah mencoba dan gagal terhubung dengan jaringan Tor dan tidak ada solusi " +"lain yang berhasil, pilih \"Ya\". Anda akan dibawa pada layar <a " +"href=\"/circumvention\">pengelakan</a>untuk mengkonfigurasi pluggable " +"transport." #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -410,12 +410,12 @@ msgid "" "ask your network administrator for guidance. If your connection does not use" " a proxy, click “Continue”." msgstr "" -"Layar selanjutnya menanyakan jika koneksi anda menggunakan sebuah proxy. " -"Pada banyak kasus, hal ini tidak diperlukan. Biasanya anda akan mengetahui " -"jika anda perlu menjawab \"yes\", sebagaimana pada pengaturan yang " -"digunakan oleh browser yang lain pada sistem anda. Jika memungkinkan, " -"tanyakan pengelola jaringan untuk panduan. Jika koneksi tidak menggunakan " -"sebuah proksi, klik \"continue\"." +"Layar selanjutnya menanyakan jika koneksi Anda menggunakan sebuah proksi. " +"Pada banyak kasus, hal ini tidak diperlukan. Biasanya Anda akan mengetahui " +"jika Anda perlu menjawab \"Ya\", sebagaimana pada pengaturan yang digunakan" +" oleh peramban lain pada sistem anda. Jika memungkinkan, tanyakan pengelola " +"jaringan untuk panduan. Jika koneksi Anda tidak menggunakan sebuah proksi, " +"klik \"Lanjut\"." #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) diff --git a/contents+tr.po b/contents+tr.po index 2a021ae59..f4953996a 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1,11 +1,11 @@ # Translators: -# Emma Peel, 2018 # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019 # cenk y. <goncagul(a)national.shitposting.agency>, 2019 # Hasan Tayyar BESIK <tayyar.besik(a)gmail.com>, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 # ilkeryus <ilkeryus(a)gmail.com>, 2019 # erinm, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-22 10:16+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -487,12 +487,15 @@ msgid "" "* Visit [https://bridges.torproject.org/ bridges.torproject.org] and follow " "the instructions, or" msgstr "" +"* https://bridges.torproject.org/ adresine giderek yönergeleri izleyin" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "" "* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address." msgstr "" +"* bridges(a)torproject.org'a Gmail, Yahoo ya da Riseup aracılığıyla bir " +"e-posta atın." #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -600,7 +603,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) msgid "<table class=\"table table-striped\">" -msgstr "" +msgstr "<table class=\"table table-striped\">" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 23 Mar '19

23 Mar '19

commit f8f961a0c8b6540607f6351614b27024ff593b34 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 08:50:18 2019 +0000 Update translations for tpo-web --- contents+es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index f4ee28387..7cb2a6e41 100644 --- a/contents+es.po +++ b/contents+es.po @@ -49,8 +49,8 @@ msgid "" "We advance human rights and defend your privacy online through free software" " and open networks. [Meet our team](about/people)." msgstr "" -"Promovemos los derechos humanos y defendemos su privacidad en linea a través" -" del software libre y las redes abiertas. [Conocé nuestro " +"Promovemos los derechos humanos y defendemos tu privacidad en linea a través" +" del software libre y las redes abiertas. [Conoce nuestro " "equipo](about/people)" #: https//www.torproject.org/contact/

1 0