February 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
by nickm＠torproject.org 05 Feb '18

05 Feb '18

commit f0d7905bc9f20ecee43da3db369073ffb73b4997 Merge: 953c769a8 78d6cb587 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 5 11:38:58 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/dos.c | 2 -- src/test/test_dos.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit bc28a26e46ecdceb6725def9fe279f1c9600c03c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:50:40 2018 +0000 Update translations for exoneratorproperties --- ti/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ti/exonerator.properties b/ti/exonerator.properties index 936754ae5..d5f204c33 100644 --- a/ti/exonerator.properties +++ b/ti/exonerator.properties @@ -1,7 +1,7 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=IP address form.timestamp.label=Date -form.search.label=Search +form.search.label=ፈትሽ summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s!

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit d376889fe563ab677efe4f9d06a9ad7f3c44be8a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:47:18 2018 +0000 Update translations for abouttor-homepage --- ti/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ti/aboutTor.dtd b/ti/aboutTor.dtd index 676878e27..b7c5237fc 100644 --- a/ti/aboutTor.dtd +++ b/ti/aboutTor.dtd @@ -18,7 +18,7 @@ <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "ፈትሽ"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torInfo1.label "Additional Info:">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 797c174a9c96e81b95ebb1cb3e8d8a4845b5d2bc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:46:58 2018 +0000 Update translations for tor-launcher-network-settings --- uk/network-settings.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd index 521db0af9..37794528f 100644 --- a/uk/network-settings.dtd +++ b/uk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Натисніть кнопку "З'єднати", щоб з'єднатися з Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Натисніть "Налаштувати", щоб налаштувати параметри мережі, якщо ви перебуваєте в країні, яка цензує Tor (наприклад, Єгипет, Китай, Туреччина) або якщо ви з'єднуєтесь з приватної мережі, для якої потрібен проксі-сервер."> <!ENTITY torSettings.configure "Налаштування"> <!ENTITY torSettings.connect "З'єднатися"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Додатково"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Я використовую проксі для з'єднання з Інтернетом"> <!ENTITY torsettings.useProxy.type "Тип проксі:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "оберіть тип проксі"> <!ENTITY torsettings.useProxy.address "Адреса:"> <!ENTITY torsettings.useProxy.address.placeholder "ІР адреса або ім'я хосту"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мій брандмауер дозволяє підключення тільки до певних портів"> <!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Тор цензується в моїй країні"> +<!ENTITY torsettings.useBridges.default "Виберіть вбудований міст"> +<!ENTITY torsettings.useBridges.default.placeholder "Виберіть міст"> +<!ENTITY torsettings.useBridges.custom "Надайте міст, який я знаю"> +<!ENTITY torsettings.useBridges.label "Уведіть інформацію про міст із надійного джерела."> +<!ENTITY torsettings.useBridges.placeholder "тип адреси: порт (по одному на рядок)"> <!ENTITY torsettings.copyLog "Скопіювати журнал Tor до буферу обміну"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "Довідка Проксі"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "Допомога по ретрансляторам типу міст"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp2 "Через те, як певні країни намагаються заблокувати Tor, деякі мости працюють в деяких країнах, а в інших ні.  Якщо ви не впевнені в тому, які мости працюють у вашій країні, відвідайте torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми встановимо з'єднання з мережею Tor.  Це може зайняти кілька хвилин.">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 754cac8a8305730c666ccfac76a557d939ff543b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:46:43 2018 +0000 Update translations for tor-launcher-properties_completed --- ms_MY/torlauncher.properties | 55 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/ms_MY/torlauncher.properties b/ms_MY/torlauncher.properties index ea4387a75..735c13531 100644 --- a/ms_MY/torlauncher.properties +++ b/ms_MY/torlauncher.properties @@ -1,31 +1,64 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pelancar Tor -torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja. -torlauncher.please_restart_app=Sila mulakan semula aplikasi ini. +torlauncher.tor_exited_during_startup=Tor tertutup ketika permulaan. Ia berkemungkinan dari ralat dalam fail torrc, pepijat dalam Tor atau berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda membaiki masalah tersebut dan mulakan semula Tor, Pelayar Tor tidak dapat dimulakan. +torlauncher.tor_exited=Tor keluar secara tidak dijangka. Ia berkemungkinan dari pepijat yang wujud di dalam Tor, berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda mulakan semula Tor, Pelayar Tor tidak dapat mencapai mana-mana laman sesawang. Jika masalah masih berlanjutan, sila hantar satu salinan Log Tor kepada pasukan sokongan. +torlauncher.tor_exited2=Memulakan semula Tor tidak akan menutup tab pelayar anda. torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor. torlauncher.tor_failed_to_start=Tor gagal untuk bermula. -torlauncher.tor_bootstrap_failed=Tor gagal untuk mewujudkan sambungan rangkaian Tor.\n\n%S +torlauncher.tor_control_failed=Gagal mengambil alih Tor. +torlauncher.tor_bootstrap_failed=Tor gagal untuk mewujudkan sambungan rangkaian Tor. +torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S torlauncher.tor_missing=Tor executable hilang. -torlauncher.torrc_missing=Fail torrc hilang. -torlauncher.datadir_missing=Direktori data Tor tidak wujud. +torlauncher.torrc_missing=Fail torrc hilang dan tidak dapat dicipta. +torlauncher.datadir_missing=Direktori data Tor tidak wujud dan tidak dapat dicipta. torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S torlauncher.failed_to_save_settings=Gagal menyimpan tetapan Tor.\n\n%S -torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor sedang berjalan. +torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor telah berjalan. -torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama host dan beberapa port bagi mengkonfigurasi Tor untuk menggunakan proksi bagi mengakses Internet. -torlauncher.error_proxy_type_missing=Anda mesti memilih jenis proksi. -torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges. +torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama hos dan nombor port bagi mengkonfigur Tor untuk menggunakan proksi yang dapat mencapai Internet. +torlauncher.error_proxy_type_missing=Anda mesti pilih jenis proksi. +torlauncher.error_bridges_missing=Anda mesti nyatakan satu atau lebih titi. +torlauncher.error_default_bridges_type_missing=Anda mesti pilih jenis angkutan untuk titi yang disediakan. +torlauncher.error_bridge_bad_default_type=Tiada titi disediakan yang mempunyai jenis angkutan %S tersedia. Sila laras tetapan anda. -torlauncher.connect=Menyambung +torlauncher.bridge_suffix.meek-amazon=(berfungsi di China) +torlauncher.bridge_suffix.meek-azure=(berfungsi di China) + +torlauncher.connect=Sambung +torlauncher.restart_tor=Mula Semula Tor torlauncher.quit=Henti torlauncher.quit_win=Keluar torlauncher.done=Selesai torlauncher.forAssistance=Untuk bantuan, hubungi %S +torlauncher.forAssistance2=Untuk dapatkan bantuan, lawati %S + +torlauncher.copiedNLogMessages=Salin selesai. %S mesej log Tor sedia ditampal ke dalam penyunting teks atau mesej emel. + +torlauncher.bootstrapStatus.conn_dir=Menyambung dengan direktori geganti +torlauncher.bootstrapStatus.handshake_dir=Menjalinkan sambungan direktori tersulit +torlauncher.bootstrapStatus.requesting_status=Memperoleh status rangkaian +torlauncher.bootstrapStatus.loading_status=Memuatkan status rangkaian +torlauncher.bootstrapStatus.loading_keys=Memuatkan sijil kuasa +torlauncher.bootstrapStatus.requesting_descriptors=Meminta maklumat geganti +torlauncher.bootstrapStatus.loading_descriptors=Memuatkan maklumat geganti +torlauncher.bootstrapStatus.conn_or=Menyambung ke rangkaian Tor +torlauncher.bootstrapStatus.handshake_or=Menjalinkan litar Tor +torlauncher.bootstrapStatus.done=Bersambung dengan rangkaian Tor! + +torlauncher.bootstrapWarning.done=selesai +torlauncher.bootstrapWarning.connectrefused=sambungan dinafikan +torlauncher.bootstrapWarning.misc=pelbagai +torlauncher.bootstrapWarning.resourcelimit=sumber tidak mencukupi +torlauncher.bootstrapWarning.identity=identiti tidak sepadan +torlauncher.bootstrapWarning.timeout=sambungan tamat masa +torlauncher.bootstrapWarning.noroute=tiada hala dihoskan +torlauncher.bootstrapWarning.ioerror=ralat baca/tulis +torlauncher.bootstrapWarning.pt_missing=angkutan boleh palam hilang

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 5a1e18cfd76149a2223030d583ae90d0041925a8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:46:38 2018 +0000 Update translations for tor-launcher-properties --- ms_MY/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ms_MY/torlauncher.properties b/ms_MY/torlauncher.properties index 786a1657d..735c13531 100644 --- a/ms_MY/torlauncher.properties +++ b/ms_MY/torlauncher.properties @@ -3,9 +3,9 @@ torlauncher.error_title=Pelancar Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited_during_startup=Tor tertutup ketika permulaan. Ia berkemungkinan dari ralat dalam fail torrc, pepijat dalam Tor atau berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda membaiki masalah tersebut dan mulakan semula Tor, Pelayar Tor tidak dapat dimulakan. +torlauncher.tor_exited=Tor keluar secara tidak dijangka. Ia berkemungkinan dari pepijat yang wujud di dalam Tor, berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda mulakan semula Tor, Pelayar Tor tidak dapat mencapai mana-mana laman sesawang. Jika masalah masih berlanjutan, sila hantar satu salinan Log Tor kepada pasukan sokongan. +torlauncher.tor_exited2=Memulakan semula Tor tidak akan menutup tab pelayar anda. torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor. torlauncher.tor_failed_to_start=Tor gagal untuk bermula. torlauncher.tor_control_failed=Gagal mengambil alih Tor. @@ -26,7 +26,7 @@ torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP ata torlauncher.error_proxy_type_missing=Anda mesti pilih jenis proksi. torlauncher.error_bridges_missing=Anda mesti nyatakan satu atau lebih titi. torlauncher.error_default_bridges_type_missing=Anda mesti pilih jenis angkutan untuk titi yang disediakan. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_bridge_bad_default_type=Tiada titi disediakan yang mempunyai jenis angkutan %S tersedia. Sila laras tetapan anda. torlauncher.bridge_suffix.meek-amazon=(berfungsi di China) torlauncher.bridge_suffix.meek-azure=(berfungsi di China) @@ -40,7 +40,7 @@ torlauncher.done=Selesai torlauncher.forAssistance=Untuk bantuan, hubungi %S torlauncher.forAssistance2=Untuk dapatkan bantuan, lawati %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Salin selesai. %S mesej log Tor sedia ditampal ke dalam penyunting teks atau mesej emel. torlauncher.bootstrapStatus.conn_dir=Menyambung dengan direktori geganti torlauncher.bootstrapStatus.handshake_dir=Menjalinkan sambungan direktori tersulit

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 42d732c0569707f5963bf2aa0f08c26525e706df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:45:17 2018 +0000 Update translations for torcheck --- ti/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ti/torcheck.po b/ti/torcheck.po index ddd4a6bca..1ea29a786 100644 --- a/ti/torcheck.po +++ b/ti/torcheck.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tigrinya (http://www.transifex.com/projects/p/torproject/language/ti/)\n" +"PO-Revision-Date: 2018-02-05 15:31+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -72,7 +72,7 @@ msgid "Learn More »" msgstr "" msgid "Go" -msgstr "" +msgstr "ኪድ" msgid "Short User Manual" msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit eb7dc5a27bfcac0b595a09cc2febd0493a277269 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:45:06 2018 +0000 Update translations for bridgedb --- ti/LC_MESSAGES/bridgedb.po | 337 +++++++++++++++++++++++---------------------- 1 file changed, 169 insertions(+), 168 deletions(-) diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po index bd164e07a..f638ac305 100644 --- a/ti/LC_MESSAGES/bridgedb.po +++ b/ti/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tigrinya (http://www.transifex.com/projects/p/torproject/language/ti/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2018-02-05 15:24+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ti\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -28,57 +29,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "ሎግ ቀይር" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -89,7 +215,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -100,7 +226,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -112,7 +238,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -121,20 +247,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -142,12 +268,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -155,48 +281,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -205,21 +331,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -227,153 +353,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[tor-messenger-build/master] Build Tor Launcher in a container
by sukhbir＠torproject.org 05 Feb '18

05 Feb '18

commit 08bcd366ed439291b67efc40494e10e05fc63e34 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Feb 5 10:40:10 2018 -0500 Build Tor Launcher in a container --- projects/tor-launcher/build | 4 ++-- projects/tor-launcher/config | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 45be6a6..f9cf764 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] [% IF c("var/tor_control_port") -%] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index aa83531..67a31b3 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -5,9 +5,13 @@ git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" +var: + container: + use_container: 1 input_files: - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 enable: '[% c("var/tor_control_port") %]' - filename: tm-logo.svg + - project: container-image

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit ff8a7b19475f2dc829941624a0ff449681b83e42 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 15:20:45 2018 +0000 Update translations for exoneratorproperties --- om/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/om/exonerator.properties b/om/exonerator.properties index 936754ae5..e35c687d4 100644 --- a/om/exonerator.properties +++ b/om/exonerator.properties @@ -39,8 +39,8 @@ technicaldetails.colheader.nickname=Nickname technicaldetails.colheader.exit=Exit relay technicaldetails.nickname.unknown=Unknown technicaldetails.exit.unknown=Unknown -technicaldetails.exit.yes=Yes -technicaldetails.exit.no=No +technicaldetails.exit.yes=Eeyee +technicaldetails.exit.no=Miti permanentlink.heading=Permanent link footer.abouttor.heading=About Tor footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by %s.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information.

1 0