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

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 15 Oct '20

15 Oct '20

commit 70a3ba92b926aa8f3ee11337af0679660db58668 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 15 09:17:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sw/torbutton.properties | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/sw/torbutton.properties b/sw/torbutton.properties index 12ef37dc97..33d83b7244 100644 --- a/sw/torbutton.properties +++ b/sw/torbutton.properties @@ -39,27 +39,27 @@ torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determ canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Sio kwa Sasa canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Ruhusu kwa baadae canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Kamwe kwenye hii tovuti (iliyopendekeza) canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%S kosa la maelezo mafupi profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Uhamiaji uliopo kwenye %S yako maelezo mafupi yameshindwa.\nMpangilio mpya utatumika. # "Downloading update" string for the hamburger menu (see #28885). # This string is kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=Downloading %S update +updateDownloadingPanelUILabel=Kupakua %S sasisha # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Kuunganisha msimbo-fiche (Huduma ya Onion, %1$S ufunguo wa bit, %3$S) +pageInfo_OnionEncryption=Kuunganisha msimbo-fiche (Huduma ya Onion) pageInfo_OnionName=Jina la Onion: # Onion services strings. Strings are kept here for ease of translation. @@ -70,52 +70,52 @@ onionServices.errorPage.onionSite=Tovuti ya Onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found +onionServices.descNotFound.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion +onionServices.descNotFound.header=Tovuti ya Onion haijapatikana onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. +onionServices.descInvalid.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion +onionServices.descInvalid.header=Tovuti ya onion haijaweza Kufikiwa +onionServices.descInvalid=Tovuti ya onion isiyoweza kufikiwa kwenye makosa ya wavuti. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected +onionServices.introFailed.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion +onionServices.introFailed.header=Tovuti ya onion haijaweza kuunganishwa onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion +onionServices.rendezvousFailed.header=Tovut ya onion haiwei kuunganisha +onionServices.rendezvousFailed=Tovuti ya onion ipi bize au mtandao wa Tor umezidiwa. Jaribu tna baadae. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.pageTitle=Imehitaji Uthibitisho +onionServices.clientAuthMissing.header=Tovuti ya onion inahitaji uthibitisho +onionServices.clientAuthMissing=Kufikia kwenye tovuti ya onion inahitaji ufunguo lakini hakuna zilizotolewa. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +onionServices.clientAuthIncorrect.pageTitle=Uthibitisho umeshindwa +onionServices.clientAuthIncorrect.header=Tovuti ya onion imeshindwa uthibitisho onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=Tatizo la upakiaji kwenye tovuti ya onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.keyPlaceholder=Ingiza ufunguo wako binafsi kwenye huduma hii ya onion onionServices.authPrompt.done=Imefanywa onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.invalidKey=Tafadhali ingiza ufunguo halali (52 msingi32 wahusika au 44 msingi wahusika) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key onionServices.authPreferences.header=Uthibitisho wa Huduma ya Onion onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. @@ -130,13 +130,13 @@ onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor onionServices.authPreferences.failedToRemoveKey=Unable to remove key # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Mara kwa mara ipe kipaumbele Onion onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Sio kwa Sasa onionLocation.notNowAccessKey=n onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available +onionLocation.tryThis=Jaribu huduma ya Onion +onionLocation.onionAvailable=.onion imepatikana onionLocation.learnMore=Soma zaidi... onionLocation.always=Mara kwa mara onionLocation.askEverytime=Uliza kila muda

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 15 Oct '20

15 Oct '20

commit c4654399e532c50f6cccfea5d92adef0ed1cbd77 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 15 08:48:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sw/torbutton.properties | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sw/torbutton.properties b/sw/torbutton.properties index 240774f7e6..12ef37dc97 100644 --- a/sw/torbutton.properties +++ b/sw/torbutton.properties @@ -1,15 +1,15 @@ torbutton.circuit_display.internet = mtandao -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.ip_unknown = IP isiyotambulika +torbutton.circuit_display.onion_site = Tovuti ya onion +torbutton.circuit_display.this_browser = Kivinjari hiki torbutton.circuit_display.relay = Relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.tor_bridge = Daraja +torbutton.circuit_display.unknown_country = Nchi isyojulikana +torbutton.circuit_display.guard = Muongozo torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Kujifunza zaidi -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Bonyeza Kunakili +torbutton.circuit_display.copied = Imenakili! torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor @@ -37,7 +37,7 @@ torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determ # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=Sio kwa Sasa canvas.notNowAccessKey=N canvas.allow=Allow in the future canvas.allowAccessKey=A @@ -60,13 +60,13 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Jina la Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Kujifunza zaidi onionServices.errorPage.browser=Kivinjari onionServices.errorPage.network=Mtandao -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Tovuti ya Onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: @@ -117,28 +117,28 @@ onionServices.authPrompt.done=Imefanywa onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.header=Uthibitisho wa Huduma ya Onion onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.savedKeys=Hifadhi Funguo... +onionServices.authPreferences.dialogTitle=Huduma Ufunguo za Onion onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=Tovuti ya Onion onionServices.authPreferences.onionKey=funguo onionServices.authPreferences.remove=Ondoa -onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.removeAll=Ondoa vyote onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor onionServices.authPreferences.failedToRemoveKey=Unable to remove key # Onion-Location strings. onionLocation.alwaysPrioritize=Always Prioritize Onions onionLocation.alwaysPrioritizeAccessKey=a -onionLocation.notNow=Not Now +onionLocation.notNow=Sio kwa Sasa onionLocation.notNowAccessKey=n onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. onionLocation.tryThis=Try Onion Services onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time +onionLocation.learnMore=Soma zaidi... +onionLocation.always=Mara kwa mara +onionLocation.askEverytime=Uliza kila muda onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Huduma za Onion

1 0

[doctor/master] Update network parameters
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 28262d9dab4b955c40376e85a210aaa4e3800b94 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 15 07:38:49 2020 +0000 Update network parameters `UseNTorHandshake` and `Support022HiddenServices` are obsolete. Adding `ExtendByEd25519ID`. --- data/consensus_health.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 64bf154..fa5fe49 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -61,10 +61,9 @@ known_params perconnbwburst known_params perconnbwrate known_params UseOptimisticData known_params pb_disablepct -known_params UseNTorHandshake known_params NumNTorsPerTAP known_params usecreatefast known_params NumDirectoryGuards known_params NumEntryGuards -known_params Support022HiddenServices +known_params ExtendByEd25519ID

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 15 Oct '20

15 Oct '20

commit a3057f36ce96ae7039b56bf4eb03957da1387a84 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 15 01:15:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- mk/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd index 67a47e79ba..0ff2075f43 100644 --- a/mk/aboutTor.dtd +++ b/mk/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Спротистави се на надзорот за време на пандемијата."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Спротивстави се на надзорот за време на пандемијата.">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 15 Oct '20

15 Oct '20

commit 33891498a3d3744cb1bb1624c7c6177444bd8175 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 15 01:15:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- mk/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd index 67a47e79ba..0ff2075f43 100644 --- a/mk/aboutTor.dtd +++ b/mk/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Спротистави се на надзорот за време на пандемијата."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Спротивстави се на надзорот за време на пандемијата.">

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 14 Oct '20

14 Oct '20

commit 4ab38bc973ea45a6209c4b9661dd25bfb21425f9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 14 23:45:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ja/messages.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ja/messages.json b/ja/messages.json index 26375b04ad..ac1b7d2aaa 100644 --- a/ja/messages.json +++ b/ja/messages.json @@ -1,6 +1,6 @@ { "appDesc": { - "message": "Snowflakeは、Tor用のWebRTCプラグ可能なトランスポートです。" + "message": "Snowflake は、Tor 用の WebRTC プラグ可能なトランスポートです。" }, "popupEnabled": { "message": "常駐する" @@ -9,22 +9,22 @@ "message": "さらに知る" }, "popupStatusOff": { - "message": "Snowflakeはオフです" + "message": "Snowflake はオフです" }, "popupStatusOn": { "message": "現在接続しているユーザー数：$1" }, "popupStatusReady": { - "message": "Snowflakeは、ユーザーへの検閲を回避する準備ができました。" + "message": "Snowflake は、ユーザーの検閲回避を支援する準備ができました。" }, "popupWebRTCOff": { - "message": "WebRTC機能が見つかりませんでした" + "message": "WebRTC 機能が見つかりませんでした" }, "popupBridgeUnreachable": { "message": "ブリッジに接続できませんでした。" }, "popupDescOn": { - "message": "Snowflakeが過去24時間に検閲を回避したユーザーの数：$1" + "message": "Snowflake が過去24時間に検閲回避を支援したユーザーの数：$1" }, "popupRetry": { "message": "再試行" @@ -36,7 +36,7 @@ "message": "クッキーが有効になっていません。" }, "websiteIntro": { - "message": "Snowflakeは、インターネット検閲を無効化するシステムです。検閲さている人は、Snowflakeを使用してインターネットにアクセスすることができます。これらの接続は、沢山のボランティアによって運営されているSnowflakeプロキシを経由します。 Snowflakeの仕組みの詳細については、<a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">Wikiドキュメント</a>を参照してください。" + "message": "Snowflake は、インターネット検閲を無効化するシステムです。検閲さている人々は、Snowflake を使用してインターネットにアクセスすることができます。これらの接続は、沢山のボランティアによって運営されている Snowflake プロキシを経由します。 Snowflake の仕組みの詳細については、<a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">Wiki ドキュメント</a>を参照してください。" }, "docWiki": { "message": "Wikiドキュメント" @@ -45,40 +45,40 @@ "message": "ブラウザ" }, "censoredUsers": { - "message": "もしインターネットアクセスが検閲されているのなら、<a href=\"https://www.torproject.org/download/\">Tor Browser</a>を使用する必要があります。" + "message": "もしあなたのインターネットアクセスが検閲されているのなら、<a href=\"https://www.torproject.org/download/\">Tor Browser</a> を使用する必要があります。" }, "extension": { "message": "拡張" }, "installExtension": { - "message": "もしあなたのインターネットアクセスが検閲されて<strong>いない</strong>なら、Snowflake拡張機能のインストールして、ネットワークを検閲されているユーザーを救いましょう。あなたのプロキシを経由して、彼らがどんなサイトにアクセスしているのか心配する必要はありません。彼らに表示されるブラウジングIPアドレスは\nTorの出口ノードで、あなたのIPアドレスではありません。" + "message": "もしあなたのインターネットアクセスが検閲されて<strong>いない</strong>なら、Snowflake 拡張機能のインストールして、ネットワークを検閲されているユーザーを救いましょう。あなたのプロキシを経由して、彼らがどんなサイトにアクセスしているのか心配する必要はありません。彼らに表示されるのは Tor の出口ノードの IP アドレスであり、あなたの IP アドレスではありません。" }, "installFirefox": { - "message": "Firefoxにインストールする" + "message": "Firefox にインストールする" }, "installChrome": { - "message": "Chromeにインストールする" + "message": "Chrome にインストールする" }, "reportingBugs": { "message": "バグを報告しています" }, "fileBug": { - "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug report. There are two ways to file a bug report:" + "message": "Snowflake にクライアントまたはプロキシとして問題が発生した場合は、バグ報告の提出を検討してください。バグ報告の提出には、次の2つの方法があります：" }, "sharedAccount": { - "message": "Edit the <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">public bug-reporting pad</a> of the anti-censorship team." + "message": "対検閲チーム（Anti-censorship team）の<a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">バグ報告用公開パッド</a>を編集する。" }, "bugTracker": { - "message": "<a href=\"https://gitlab.torproject.org/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "Tor Project の GitLab に<a href=\"https://gitlab.torproject.org/\">アカウントをリクエスト</a>して、Snowflake プロジェクトで<a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">新しく issue を開く</a>。" }, "descriptive": { - "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug." + "message": "バグに関する情報をできるだけ詳細に説明するようにしてください。可能であればバグを再現するのに役立つログメッセージも記載してください。" }, "embed": { "message": "埋め込む" }, "possible": { - "message": "Snowflakeバッジを任意のWebサイトに埋め込むことができるようになりました。" + "message": "Snowflake バッジを任意のウェブサイトに埋め込むことができるようになりました。" }, "looksLike": { "message": "これは次のようになります："

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 14 Oct '20

14 Oct '20

commit 47dadf83b1385c592b069f568627f9601af5d2c2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 14 23:45:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- nl/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 252902a914..738de6bd54 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Gebruik een masker, gebruik Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Wees bestand tegen de surveillancepandemie."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Verzet je tegen de surveillancepandemie.">

1 0

[newsletter/master] Added captcha and error handling to newsletter form
by hiro＠torproject.org 14 Oct '20

14 Oct '20

commit 8fb60a284a9e96b3fcec9972cadfae458d37b912 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Tue Sep 22 15:10:36 2020 -0700 Added captcha and error handling to newsletter form There are some errors that can happen when submitting the subscription request and we don't want to have any styled pages on the donate site once we finish moving the donate pages to lektor, so we need to have the donate site redirect with error messages back to the original page, then use Javascript to get the errors displayed. Issue #48283 --- lego | 2 +- templates/intro.html | 22 +++++++++++++++++++--- templates/newsletter.html | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lego b/lego index 7f2289b..925c4c1 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit 925c4c1761ca69c4367f79b15ed9a2bc19a19a33 diff --git a/templates/intro.html b/templates/intro.html index 35b2726..7846fd3 100644 --- a/templates/intro.html +++ b/templates/intro.html @@ -30,16 +30,32 @@ <div class="row mb-1"> <div class="col-12"> <div class="row mt-4 mb-2"> - <form action="https://donate.torproject.org/subscription-request" method="POST" class="form-wide"> + <form action="https://tor-donate.local/subscription-request" method="POST" class="form-wide"> + <input type="hidden" name="returnToReferrer" value="1" /> <div class="form-group row"> - <div class="col-sm-10"> + <div class="col-sm-12 errors"> + </div> + </div> + <div class="form-group row"> + <div class="col-sm-12"> <input class="form-control form-control-lg form-required" id="email" name="email" placeholder="* Email Address" value="" type="email" /> </div> - <input class="donate btn btn-lg btn-success btn-block col-2" value="Join" type="submit" /> + </div> + <div class="form-group row"> + <div class="col-sm-6 captcha"> + <input id="captcha" type="text" class="form-control form-control-lg form-required" data-name="captcha" data-stripe="captcha" aria-label="captcha" name="captcha" size="4" placeholder="* Enter the 4 letters (case insenstive) that appear below"> + <img src="https://tor-donate.local/captcha" border="0" /> + </div> + </div> + <div class="form-group row"> + <div class="col-sm-12"> + <input class="donate btn btn-lg btn-success btn-block col-2" value="Join" type="submit" /> + </div> </div> </form> </div> </div> </div> +<script src="{{ '/static/js/errors.js'|asseturl }}" ></script> {% endblock %} diff --git a/templates/newsletter.html b/templates/newsletter.html index 8772ec3..7ab7c33 100644 --- a/templates/newsletter.html +++ b/templates/newsletter.html @@ -2,6 +2,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="{{ '/static/style.css'|asseturl }}"> +<script src="{{ '/static/js/errors.js'|asseturl }}"></script> <title>{% block title %}{{ this.title }}{% endblock %}</title> <body>

1 0

[newsletter/master] Added page for subscription confirmation errors
by hiro＠torproject.org 14 Oct '20

14 Oct '20

commit 37acf0ce3334bb5c9d050565cb67d70f8d7da0b8 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Tue Sep 22 15:52:24 2020 -0700 Added page for subscription confirmation errors Once we finish all of the Lektor work for the donate site, we don't want to have any display pages on the donate site any more, so the error pages need to be moved here. Issue #48283 --- content/subscription-error/contents.lr | 7 +++++++ lego | 2 +- templates/errors.html | 28 ++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/content/subscription-error/contents.lr b/content/subscription-error/contents.lr new file mode 100644 index 0000000..ac648bb --- /dev/null +++ b/content/subscription-error/contents.lr @@ -0,0 +1,7 @@ +_model: page +--- +title: Error Confirming Your Subscription +--- +html: errors.html +--- +_template: errors.html diff --git a/lego b/lego index 925c4c1..de11708 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 925c4c1761ca69c4367f79b15ed9a2bc19a19a33 +Subproject commit de117085d3e2f48f1f5878b5f1d6951a07662d5c diff --git a/templates/errors.html b/templates/errors.html new file mode 100644 index 0000000..ebc1a5b --- /dev/null +++ b/templates/errors.html @@ -0,0 +1,28 @@ +{% from "macros/archive.html" import render_intro_post %} +<!doctype html> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +<title>{% block title %}{{ this.title }}{% endblock %}</title> +<body class="no-gutters" data-spy="scroll" data-target="#sidenav-topics" id="topics" data-children=".item"> + <header> + {% include 'navbar.html' %} + </header> + <div class="page bg-light"> + <div class="container-fluid"> + <div class="row flex-xl-nowrap"> + <main role="main" class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 mx-auto m-5"> + <h2>{{ this.title }}</h2> + <div class="errors"> + </div> + {% block body %}{% endblock %} + <script src="{{ '/static/js/errors.js'|asseturl }}" ></script> + </main> + </div> + </div> + </div> + <footer class="footer"> + {% include 'footer.html' %} + </footer> +</body>

1 0

[newsletter/master] Switched GRs lego repository
by hiro＠torproject.org 14 Oct '20

14 Oct '20

commit 3305714a76b04e7e3cf556f1b3a1d11879103e4a Author: Peter Haight <peterh(a)giantrabbit.com> Date: Tue Sep 22 16:43:31 2020 -0700 Switched GRs lego repository We'll need to switch this back when we merge back into Tor's repositories. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d246c46..96cf970 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lego"] path = lego - url = https://git.torproject.org/project/web/lego.git + url = ssh://git@git.giantrabbit.com/tor/lego.git

1 0