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

[Git][tpo/applications/android-components][android-components-63.0.1-10.0-1] 15 commits: Bug 40005: Modify Default toolbar menu
by Georg Koppen 06 Nov '20

06 Nov '20

Georg Koppen pushed to branch android-components-63.0.1-10.0-1 at The Tor Project / Applications / android-components Commits: 83bfd541 by Matthew Finkel at 2020-11-05T01:19:56+00:00 Bug 40005: Modify Default toolbar menu - - - - - 942147de by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - e0606995 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40002: Ensure system download manager is not used - - - - - 6ab9b343 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - db5e1e29 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40006: Expose Security Level interface - - - - - 92cfdeed by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40011: Hide option for disallowing addons in private mode - - - - - 2a46dd3d by Georg Koppen at 2020-11-05T01:19:58+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 3b8dc42e by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40015: Port padlock states for .onion services - - - - - 2b8a07d2 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - b7928400 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 811907fe by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - aa06dcfc by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40020: Disable third-party cookies - - - - - ea650f06 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40023: Stop PrivateNotificationService - - - - - bfffb3ae by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40024: Disable tracking protection by default - - - - - 5112e324 by Alex Catarineu at 2020-11-05T01:32:13+00:00 Bug 40019: Expose spoofEnglish pref - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenu.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - + components/browser/search/src/main/assets/searchplugins/youtube.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit 1bea7e1f329f609a2ccf97a39a5da11a876d92e1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 08:46:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+sq.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code_of_conduct+sq.po b/code_of_conduct+sq.po index 382aaa1f17..dd18a073ac 100644 --- a/code_of_conduct+sq.po +++ b/code_of_conduct+sq.po @@ -513,11 +513,13 @@ msgid "" "Sustained disruption of any community events, including talks, " "presentations, and online conversations." msgstr "" +"Prishje me dashje e çfarëdo veprimtarie të bashkësisë, përfshi diskutime, " +"prezantime, dhe biseda internetore." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:177 msgid "Deliberately pushing against someone's stated boundaries." -msgstr "" +msgstr "Mësymja me dashje kundër kufijve të deklaruar të dikujt." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:179

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit 3bb7be2f79b007414b547d4657f0843c856e8941 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 08:15:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+sq.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code_of_conduct+sq.po b/code_of_conduct+sq.po index 3671431e36..382aaa1f17 100644 --- a/code_of_conduct+sq.po +++ b/code_of_conduct+sq.po @@ -163,6 +163,8 @@ msgid "" " DON'T: Hunt for ways to uphold the letter of this code while violating its\n" " spirit.\n" msgstr "" +" MOS: Rrëmoni për rrugë si të ngrini lart fjalët e këtij kodi, teksa shkelni\n" +" frymën e tij.\n" #. type: Plain text #: ../code_of_conduct.txt:50 @@ -502,6 +504,8 @@ msgstr "" msgid "" "Deliberately undermining the spirit of this code while following the letter." msgstr "" +"Dobësim me dashje i frymës së këtij kodi, teksa ndiqen formalisht fjalët e " +"tij." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:175

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit 5803cdefef4c085c6a276305aabfe0dc70ff81c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 06:15:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- pl/torbrowser_strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pl/torbrowser_strings.xml b/pl/torbrowser_strings.xml index 282d128133..4c793a8e72 100644 --- a/pl/torbrowser_strings.xml +++ b/pl/torbrowser_strings.xml @@ -26,6 +26,7 @@ <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Uzyskaj Most, który znam</string> <string name="preferences_tor_network_settings_bridge_config_current_bridge">Aktualnie skonfigurowany mostek: 1%s </string> <string name="tor_network_settings_bridge_not_configured">Nie skonfigurowany</string> + <string name="preferences_tor_network_settings_status">Bieżący status</string> <string name="preferences_tor_network_settings_yes">Tak</string> <string name="preferences_tor_network_settings_no">Nie</string> <string name="preferences_tor_network_settings_disconnected">Rozłączono</string>

1 0

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

06 Nov '20

commit 7712bb4de49d60162c05468e98b9057e9ede5e70 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 02:15:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ka/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd index 0a336325b7..4bbd6cfd7d 100644 --- a/ka/aboutTor.dtd +++ b/ka/aboutTor.dtd @@ -33,4 +33,4 @@  <!ENTITY aboutTor.ey2020.useamask "გაიკეთეთ ნიღაბი, გამოიყენეთ Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "დაიცავით თავი, მეთვალყურეობის პანდემიისგან."> -<!ENTITY aboutTor.ey2020.donationmatch "Your donation will be matched by Friends of Tor."> +<!ENTITY aboutTor.ey2020.donationmatch "თქვენი შემოწირულობა გაორმაგდება Tor-ის მეგობრების მხარდაჭერით.">

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit eae2f240f880176060ad1d6177bfd25a801aebd5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 01:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index ac0b9585c8..888a1a4242 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -30,7 +30,7 @@ msgstr "" #: https//community.torproject.org/ (content/contents+en.lrpage.title) msgid "Join the Tor Community" -msgstr "Torプロジェクトに参加してください！" +msgstr "Tor プロジェクトに参加する" #: https//community.torproject.org/ (content/contents+en.lrpage.subtitle) msgid "Our community is made up of human rights defenders around the world." @@ -2095,7 +2095,7 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Monthly Outbound Traffic" -msgstr "＃月間のアウトバウンドトラフィック" +msgstr "＃月あたりの送信トラフィック" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -2136,14 +2136,14 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Public IPv4 Address" -msgstr "＃パブリックIPv4アドレス" +msgstr "＃パブリック IPv4 アドレス" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "Every relay needs a public IPv4 address - either directly on the host " "(preferred) or via NAT and port forwarding." -msgstr "すべてのリレーには、パブリックIPv4アドレスが必要です-ホスト上で直接（推奨）またはNATおよびポート転送を介します。" +msgstr "すべてのリレーには、パブリック IPv4 アドレスが必要です-ホスト上で直接（推奨）またはNATおよびポート転送を介します。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -2183,7 +2183,7 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Note: You can only run two Tor relays per public IPv4 address." -msgstr "注：パブリックIPv4アドレスごとに実行できるTorリレーは2つだけです。" +msgstr "注：パブリック IPv4 アドレスごとに実行できる Tor リレーは2つだけです。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -2194,42 +2194,42 @@ msgstr "3つ以上のリレーを実行する場合は、さらにIPv4アドレ #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Memory Requirements" -msgstr "＃メモリ必要な条件" +msgstr "＃メモリの必要条件" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* A <40 Mbit/s non-exit relay should have at least 512 MB of RAM available." -msgstr "・40 Mbit/s未満の非終了リレーには、少なくとも512MBのRAMが必要です。" +msgstr "* 通信速度が 40 Mbit/s 未満の非出口リレーには、少なくとも 512 MB の RAM が必要です。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* A non-exit relay faster than 40 Mbit/s should have at least 1 GB of RAM." -msgstr "・40 Mbit/sより速い非終了リレーには、少なくとも1 GBのRAMが必要です。" +msgstr "* 通信速度が 40 Mbit/s より速い非出口リレーには、少なくとも 1 GB の RAM が必要です。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* On an exit relay we recommend at least 1.5 GB of RAM per tor instance." -msgstr "・出口リレーでは、Torのインスタンスごとに少なくとも1.5 GBのRAMを推奨します。" +msgstr "* 出口リレーでは、Tor のインスタンスごとに少なくとも 1.5 GB の RAM を推奨します。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Disk Storage" -msgstr "＃ディスクストレージ" +msgstr "＃ストレージ容量" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Tor does not need much disk storage." -msgstr "Torは、多くのディスクストレージを必要としません。" +msgstr "Tor は、そこまで多くのストレージ容量を必要としません。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "A typical Tor relay needs less than 200 MB for Tor related data (in addition" " to the operating system itself)." -msgstr "典型的なTorリレーは、Tor関連データ（OS自体に加えて）に200 MB未満を必要とします。" +msgstr "一般的な Tor リレーは、（OS 自体に加えて）Tor 関連データの保存に 200 MB 未満の容量を必要とします。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -2283,7 +2283,7 @@ msgstr "再起動やTorデーモンの再起動をする場合は問題ありま #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Tor Version" -msgstr "＃Torバージョン" +msgstr "＃Tor バージョン" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit 9ff4e8823626bac1453d2e54b67c0d542c931ff6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 01:15:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 7dcdabba82..ac0b9585c8 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -153,21 +153,21 @@ msgstr "翻訳を支援する" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) msgid "##Localization is how we reach a global community." -msgstr "## ローカライゼーションは、私たちがグローバルなコミュニティになるための方法です。" +msgstr "## 翻訳は、私たちがグローバルなコミュニティになるための方法です。" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) msgid "" "In order for Tor to work for everyone, it needs to speak everyone's " "languages." -msgstr "Torがすべての人のために機能するためには、すべての人の言語を話す必要があります。" +msgstr "Tor をすべての人が利用できるようにするには、すべての人の言語に対応する必要があります。" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) msgid "" "Our volunteer translation team works hard to make this a reality, and we can" " always use more help." -msgstr "私たちのボランティア翻訳チームはこれを実現するために一生懸命働いており、私たちはいつでもより多くの助けを借りることができます。" +msgstr "私たちのボランティアによる翻訳チームはこれを実現するために一生懸命働いており、私たちは常に皆さんからの協力を必要としています。" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) @@ -177,9 +177,9 @@ msgid "" " Project website](https://torpat.ch/tpo-locales), but there are many other " "documents that we could use help translating as well." msgstr "" -"現在の翻訳の優先順位は、「Tor Browser」（　https://torpat.ch/tpo-locales　）、Tor " -"Browserのドキュメント、および「Tor Project Webサイト」（　https://torpat.ch/tpo-locales　" -"）の翻訳ですが、使用できる他の多くのドキュメントも翻訳に役立ちます。" +"現在優先的に翻訳を行っているのは、[Tor Browser](https://torpat.ch/locales) 、Tor Browser " +"ドキュメント、[Tor Project ウェブサイト](https://torpat.ch/tpo-" +"locales)ですが、他にも翻訳が必要な文書はたくさん存在します。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) @@ -1206,6 +1206,9 @@ msgid "" " simply find the string and fix it in " "[transifex](https://www.transifex.com/otf/torproject/)." msgstr "" +"* あなたが既に [Tor の翻訳者](../becoming-tor-" +"translator)である場合は、[Transifex](https://www.transifex.com/otf/torproject/) " +"で当該文字列を探して翻訳を修正することができます。" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) @@ -1214,6 +1217,8 @@ msgid "" " our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), " "under the **Community/Translations** component." msgstr "" +"* 修正する文字列を見つける方法がわからない場合は、**コミュニティ/翻訳コ**ンポーネントの下にある [Bugtracker " +"でチケットを開く](https://support.torproject.org/misc/bug-or-feedback/)ことができます。" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) @@ -1222,6 +1227,8 @@ msgid "" "Translations](https://trac.torproject.org/projects/tor/query?status=accepte…" " because maybe it is already reported." msgstr "" +"既に同じ問題に関して報告が行われている可能性があるため、チケットを開く前に、[現在開いている Translations " +"のチケット](https://trac.torproject.org/projects/tor/query?status=accepted&statu…" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) @@ -1253,6 +1260,7 @@ msgid "" "Not sure where to start? Here you can find an overview of the current " "localization status for all of the different Tor Project projects." msgstr "" +"どこから翻訳すれば良いのか分かりませんか？こちらで、各 Tor Project におけるプロジェクトの現在の翻訳状況の概要をご確認いただけます。" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body) @@ -1375,6 +1383,8 @@ msgid "" "third-party translation platform. Learn how to sign up and begin " "contributing." msgstr "" +"私たちの翻訳の取り組みは、サードパーティの翻訳プラットフォームである Transifex 上の Localization Lab Hub " +"で行われています。登録して翻訳による貢献を始める方法に関しては、こちらをご覧ください。" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -1544,12 +1554,12 @@ msgstr "" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.title) msgid "Getting help" -msgstr "" +msgstr "助けを得る" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.subtitle) msgid "How to get help if you run into issues" -msgstr "" +msgstr "問題が発生した場合に助けを得る方法" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.body) @@ -1571,14 +1581,14 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.title) msgid "Technical considerations" -msgstr "" +msgstr "技術的な考慮事項" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.subtitle) msgid "" "How to choose a good hosting provider, what's an AS and Operating System " "diversity." -msgstr "" +msgstr "良いホスティングプロバイダーを選択する方法と、AS とオペレーティングシステムの多様性について。" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1866,14 +1876,14 @@ msgstr "" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.title) msgid "Technical Setup" -msgstr "技術的なセットアップ" +msgstr "セットアップ方法" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.subtitle) msgid "" "How to install and configure each type of relay: bridge, guard, middle, and " "exit." -msgstr "各タイプのリレー（ブリッジ、ガード、ミドル、終了・出口）をインストールおよび構成する方法。" +msgstr "ブリッジ、ガード、ミドル、および出口などの各種類のリレーをインストールおよび構成する方法。" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -1997,14 +2007,15 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.title) msgid "Relay requirements" -msgstr "リレーに必要な条件" +msgstr "リレーの必要条件" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.subtitle) msgid "" "Requirements for Tor relays depend on the type of relay and the bandwidth " "they provide. Learn more about specific relay requirements." -msgstr "Torリレーの必要な条件は、リレーのタイプと提供する帯域幅によって異なります。特定のリレー必要な条件の詳細をご覧ください。" +msgstr "" +"Tor リレーの必要条件は、リレーの種類と提供する帯域幅によって異なります。各リレーにおいて必要な条件の詳細に関してはこちらをご覧ください。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -2287,7 +2298,7 @@ msgstr "" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.title) msgid "Types of relays on the Tor network" -msgstr "Torネットワーク上のリレーの種類" +msgstr "Tor ネットワークにおけるリレーの種類" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.subtitle) @@ -2295,7 +2306,7 @@ msgid "" "Bridges, guards, middle relays, and exits all serve important functions in " "the Tor network. Learn about the different relays you can run." msgstr "" -"ブリッジ、ガード、中間リレー、および出口はすべて、Torネットワークで重要な機能を果たします。実行できるさまざまなリレーについて説明します。" +"ブリッジ、ガード、中間リレー、および出口はすべて、Tor ネットワークで重要な機能を果たします。実行できるリレーの種類と違いについてご説明します。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -14610,7 +14621,7 @@ msgstr "Tor Project" #: templates/localization.html:27 msgid "Can you help us improve our translations?" -msgstr "" +msgstr "翻訳の改善にご協力いただけますか？" #: templates/localization.html:29 msgid "" @@ -14618,10 +14629,11 @@ msgid "" "improvements we could make to our translations? Open a ticket, reach out to " "us, or become part of our translators squad." msgstr "" +"翻訳は、アプリケーション全体におよぶ継続的なプロセスです。翻訳の改善にご注目ください。チケットを開いたり、私たちを支援するか、翻訳者チームの一員になってください。" #: templates/localization.html:32 msgid "Translators mailing list" -msgstr "" +msgstr "翻訳者のメーリングリスト" #: templates/meta.html:3 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit f98de9bc1da4e5907aab66aefee8294cc6f2fdd6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 00:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index e03cbec3b6..7dcdabba82 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -148,7 +148,7 @@ msgstr "私たちは、Tor を世界中のすべての人に使ってもらい #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.cta) msgid "Help us translate" -msgstr "翻訳を手伝ってください" +msgstr "翻訳を支援する" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) @@ -1143,7 +1143,7 @@ msgstr "" #: https//community.torproject.org/training/code-of-conduct/ #: (content/training/code-of-conduct/contents+en.lrpage.cta) msgid "Code of Conduct" -msgstr "" +msgstr "行動規範" #: https//community.torproject.org/training/code-of-conduct/ #: (content/training/code-of-conduct/contents+en.lrpage.body) @@ -1157,7 +1157,8 @@ msgid "" "community. Tor is a place where people should feel safe to engage, share " "their point of view, and participate." msgstr "" -"Torプロジェクトは、包括的な環境とコミュニティの育成に取り組んでいます。 Torは、人々が安心して関与し、意見を共有し、参加する場所です。" +"Tor Project は、包括的な環境およびコミュニティの育成に取り組んでいます。Tor " +"は、人々が安全に参加し、自分の考えを共有できる場所である必要があります。" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.title) @@ -1184,19 +1185,19 @@ msgstr "あなたは、Tor の使用方法についてあなたのコミュニ #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.title) msgid "Report a problem with a translation" -msgstr "" +msgstr "翻訳に関する問題を報告する" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.subtitle) msgid "" "Sometimes the translations of apps are not working correctly. Here you can " "learn to fix it." -msgstr "" +msgstr "アプリの翻訳に何らかの間違いが発生することがあります。こちらでその修正方法をご確認いただけます。" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) msgid "### Reporting an error with a translation" -msgstr "" +msgstr "### 翻訳によるエラーの報告" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) @@ -1228,6 +1229,8 @@ msgid "" "* You can send an email to the [tor localization mailing " "list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n)." msgstr "" +"* [Tor ローカライゼーションメーリングリスト](https://lists.torproject.org/cgi-" +"bin/mailman/listinfo/tor-l10n)宛に電子メールを送信することで報告することができます。" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.body) @@ -1236,11 +1239,13 @@ msgid "" "touch/#irc-help), on the #tor-l10n channel on the oftc network (you may need" " to be registered to log in)." msgstr "" +"* このような問題は、[irc](https://support.torproject.org/get-in-touch/#irc-help) の " +"oftc ネットワーク上の #tor-l10n チャンネルで報告することができます（ログインには登録が必要な場合があります）。" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.title) msgid "Current Status of Translations" -msgstr "" +msgstr "現在の翻訳状況" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.subtitle) @@ -1297,12 +1302,12 @@ msgstr "" #: https//community.torproject.org/localization/pick-a-project/ #: (content/localization/pick-a-project/contents+en.lrpage.title) msgid "Pick a project" -msgstr "" +msgstr "プロジェクトを選択する" #: https//community.torproject.org/localization/pick-a-project/ #: (content/localization/pick-a-project/contents+en.lrpage.subtitle) msgid "How to find a project to contribute to" -msgstr "" +msgstr "貢献するプロジェクトを見つける方法" #: https//community.torproject.org/localization/pick-a-project/ #: (content/localization/pick-a-project/contents+en.lrpage.body) @@ -1361,7 +1366,7 @@ msgstr "" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.title) msgid "Becoming a Tor translator" -msgstr "Torの翻訳者になる方法" +msgstr "Tor の翻訳者になる" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.subtitle) @@ -14468,7 +14473,7 @@ msgid "" "availability and use, and furthering their scientific and popular " "understanding." msgstr "" -"フリー・オープンソースの匿名性技術・プライバシー技術の開発と展開によって人権と自由を向上し、その制限されない有効性と利用を支援し、また、人々の正確な理解を促進する。" +"フリーでオープンソースの匿名化技術・プライバシー技術の開発と展開によって人権と自由を向上し、それらの制限のない可用性と利用を支援し、そして人々の科学的・一般的な理解を促進する。" #: lego/templates/footer.html:64 lego/templates/footer.html:66 #: lego/templates/navbar.html:19 lego/templates/navbar.html:21 @@ -14494,7 +14499,7 @@ msgstr "登録" msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our %(link_to_faq)s" -msgstr "商標、著作権表示、第三者による使用の規定については %(link_to_faq)s をご覧ください。" +msgstr "商標、著作権表示、第三者による使用に関する規定については %(link_to_faq)s をご覧ください。" #: lego/templates/navbar.html:26 templates/navbar.html:26 msgid "Menu"

1 0

[snowflake/master] Revert accidentally merged code
by cohosh＠torproject.org 06 Nov '20

06 Nov '20

commit 61beb9d996527cd8cb9e4ca650f8cbf24df1503e Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Nov 5 19:28:20 2020 -0500 Revert accidentally merged code Some temporary testing code for the proxy got accidentally merged into the latest changes. This commit undoes that mistake. --- proxy/snowflake.go | 205 +++++++++++++---------------------------------------- 1 file changed, 49 insertions(+), 156 deletions(-) diff --git a/proxy/snowflake.go b/proxy/snowflake.go index 0df0d17..276ebed 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -352,7 +352,7 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { // candidates is complete and the answer is available in LocalDescription. // Installs an OnDataChannel callback that creates a webRTCConn and passes it to // datachannelHandler. -func makePeerConnection(offering bool, sdp *webrtc.SessionDescription, +func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config webrtc.Configuration, dataChan chan struct{}, handler func(conn *webRTCConn, remoteAddr net.Addr)) (*webrtc.PeerConnection, error) { @@ -361,99 +361,67 @@ func makePeerConnection(offering bool, sdp *webrtc.SessionDescription, if err != nil { return nil, fmt.Errorf("accept: NewPeerConnection: %s", err) } + pc.OnDataChannel(func(dc *webrtc.DataChannel) { + log.Println("OnDataChannel") + close(dataChan) - if offering { - offer, err := pc.CreateOffer(nil) - // TODO: Potentially timeout and retry if ICE isn't working. - if err != nil { - log.Println("Failed to prepare offer", err) - pc.Close() - return nil, err - } - log.Println("WebRTC: Created offer") - err = pc.SetLocalDescription(offer) - if err != nil { - log.Println("Failed to prepare offer", err) - pc.Close() - return nil, err - } - log.Println("WebRTC: Set local description") + pr, pw := io.Pipe() + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} - dc, err := pc.CreateDataChannel("test", &webrtc.DataChannelInit{}) - if err != nil { - log.Printf("CreateDataChannel ERROR: %s", err) - return nil, err - } dc.OnOpen(func() { - log.Println("WebRTC: DataChannel.OnOpen") - close(dataChan) + log.Println("OnOpen channel") }) dc.OnClose(func() { - log.Println("WebRTC: DataChannel.OnClose") + conn.lock.Lock() + defer conn.lock.Unlock() + log.Println("OnClose channel") + conn.dc = nil dc.Close() + pw.Close() }) - } else { - pc.OnDataChannel(func(dc *webrtc.DataChannel) { - log.Println("OnDataChannel") - close(dataChan) - - pr, pw := io.Pipe() - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} - - dc.OnOpen(func() { - log.Println("OnOpen channel") - }) - dc.OnClose(func() { - conn.lock.Lock() - defer conn.lock.Unlock() - log.Println("OnClose channel") - conn.dc = nil - dc.Close() - pw.Close() - }) - dc.OnMessage(func(msg webrtc.DataChannelMessage) { - var n int - n, err = pw.Write(msg.Data) - if err != nil { - if inerr := pw.CloseWithError(err); inerr != nil { - log.Printf("close with error generated an error: %v", inerr) - } - } - if n != len(msg.Data) { - panic("short write") + dc.OnMessage(func(msg webrtc.DataChannelMessage) { + var n int + n, err = pw.Write(msg.Data) + if err != nil { + if inerr := pw.CloseWithError(err); inerr != nil { + log.Printf("close with error generated an error: %v", inerr) } - }) - - go handler(conn, conn.RemoteAddr()) - }) - err = pc.SetRemoteDescription(*sdp) - if err != nil { - if inerr := pc.Close(); inerr != nil { - log.Printf("unable to call pc.Close after pc.SetRemoteDescription with error: %v", inerr) } - return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) + if n != len(msg.Data) { + panic("short write") + } + }) + + go handler(conn, conn.RemoteAddr()) + }) + + err = pc.SetRemoteDescription(*sdp) + if err != nil { + if inerr := pc.Close(); inerr != nil { + log.Printf("unable to call pc.Close after pc.SetRemoteDescription with error: %v", inerr) } - log.Println("sdp offer successfully received.") + return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) + } + log.Println("sdp offer successfully received.") - log.Println("Generating answer...") - answer, err := pc.CreateAnswer(nil) - // blocks on ICE gathering. we need to add a timeout if needed - // not putting this in a separate go routine, because we need - // SetLocalDescription(answer) to be called before sendAnswer - if err != nil { - if inerr := pc.Close(); inerr != nil { - log.Printf("ICE gathering has generated an error when calling pc.Close: %v", inerr) - } - return nil, err + log.Println("Generating answer...") + answer, err := pc.CreateAnswer(nil) + // blocks on ICE gathering. we need to add a timeout if needed + // not putting this in a separate go routine, because we need + // SetLocalDescription(answer) to be called before sendAnswer + if err != nil { + if inerr := pc.Close(); inerr != nil { + log.Printf("ICE gathering has generated an error when calling pc.Close: %v", inerr) } + return nil, err + } - err = pc.SetLocalDescription(answer) - if err != nil { - if err = pc.Close(); err != nil { - log.Printf("pc.Close after setting local description returned : %v", err) - } - return nil, err + err = pc.SetLocalDescription(answer) + if err != nil { + if err = pc.Close(); err != nil { + log.Printf("pc.Close after setting local description returned : %v", err) } + return nil, err } return pc, nil @@ -467,7 +435,7 @@ func runSession(sid string) { return } dataChan := make(chan struct{}) - pc, err := makePeerConnection(false, offer, config, dataChan, datachannelHandler) + pc, err := makePeerConnectionFromOffer(offer, config, dataChan, datachannelHandler) if err != nil { log.Printf("error making WebRTC connection: %s", err) retToken() @@ -567,11 +535,6 @@ func main() { updateNATType(config.ICEServers) log.Printf("NAT type: %s", currentNATType) - // use probetest to determine NAT compatability - for { - testThroughput(config, "https://snowflake-broker.torproject.net:8443") - } - for { getToken() sessionID := genSessionID() @@ -579,76 +542,6 @@ func main() { } } -func testThroughput(config webrtc.Configuration, probeURL string) { - - var err error - - probe := new(SignalingServer) - probe.transport = http.DefaultTransport.(*http.Transport) - broker.transport.(*http.Transport).ResponseHeaderTimeout = 30 * time.Second - probe.url, err = url.Parse(probeURL) - if err != nil { - log.Printf("Error parsing url: %s", err.Error()) - } - probePath := probe.url.ResolveReference(&url.URL{Path: "probe"}) - - // create offer - dataChan := make(chan struct{}) - pc, err := makePeerConnection(true, nil, config, dataChan, func(conn *webRTCConn, addr net.Addr) { conn.Close() }) - if err != nil { - log.Printf("error making WebRTC connection: %s", err) - return - } - - offer := pc.LocalDescription() - sdp, err := util.SerializeSessionDescription(offer) - if err != nil { - log.Printf("Error encoding probe message: %s", err.Error()) - return - } - - // send offer - body, err := messages.EncodePollResponse(sdp, true, "") - if err != nil { - log.Printf("Error encoding probe message: %s", err.Error()) - return - } - log.Println(string(body)) - resp, err := probe.Post(probePath.String(), bytes.NewBuffer(body)) - if err != nil { - log.Printf("error polling probe: %s", err.Error()) - return - } - - sdp, _, err = messages.DecodeAnswerRequest(resp) - if err != nil { - log.Printf("Error reading probe response: %s", err.Error()) - return - } - answer, err := util.DeserializeSessionDescription(sdp) - if err != nil { - log.Printf("Error setting answer: %s", err.Error()) - return - } - err = pc.SetRemoteDescription(*answer) - if err != nil { - log.Printf("Error setting answer: %s", err.Error()) - return - } - - log.Println("Trying to open datachannel") - select { - case <-dataChan: - log.Println("Connection successful.") - case <-time.After(dataChannelTimeout): - log.Println("Timed out waiting for client to open data channel.") - if err := pc.Close(); err != nil { - log.Printf("error calling pc.Close: %v", err) - } - } - -} - // use provided STUN server(s) to determine NAT type func updateNATType(servers []webrtc.ICEServer) {

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Nov '20

06 Nov '20

commit 880f3cdd9b48f62df5efde7c84467c6ec7856a5c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 00:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 58ab304899..e03cbec3b6 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -57,7 +57,7 @@ msgstr "" msgid "" "Below you'll find some different ways to volunteer with the Tor community as" " well as resources to help you help Tor." -msgstr "以下に、Torコミュニティでボランティアをするいくつかの方法と、Torを支援するための手順を示します。" +msgstr "以下のような方法で、Tor コミュニティでボランティアとして活動したり、Tor を支援することができます。" #: https//community.torproject.org/gsoc/ #: (content/gsoc/contents+en.lrpage.title) @@ -94,14 +94,12 @@ msgstr "トレーニング" #: (content/training/resources/contents+en.lrpage.subtitle) msgid "" "Do you teach your community about using Tor? These resources are for you." -msgstr "" -"Torの使用についてあなたのコミュニティに教えていますか？\n" -"これらの説明はあなたのためです。" +msgstr "あなたは、Tor の使用方法についてあなたのコミュニティに教えようとしていますか？こちらのリソースをご活用ください。" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.cta) msgid "Check our resources" -msgstr "リソース群をチェックする。" +msgstr "リソースを確認する" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) @@ -186,7 +184,7 @@ msgstr "" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) msgid "Relay Operations" -msgstr "" +msgstr "リレーオペレーター" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.subtitle) @@ -194,14 +192,13 @@ msgid "" "Relays are the backbone of the Tor network. Help make Tor stronger and " "faster by running a relay today." msgstr "" -"リレーはTorネットワークで最も重要なバックボーンです。\n" -"今すぐにTorリレーを運営して、Torをより強く、より速くしてください。\n" -"運営にかかるコストは無料です！" +"リレーは、Tor ネットワークのバックボーンです。多くの人々がリレーを実行することにより、Tor " +"がより強固になり、より高速な通信が行えるようになります。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.cta) msgid "Grow the Tor network" -msgstr "Torネットワークを巨大化しましょう" +msgstr "Tor ネットワークを成長させる" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) @@ -266,17 +263,17 @@ msgstr "アウトリーチ" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.subtitle) msgid "Bring Tor materials to your next community event." -msgstr "次のコミュニティイベントにTorの資料をお持ちください。" +msgstr "次のコミュニティイベントに Tor に関する資料を持っていく。" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.cta) msgid "Tell the world about Tor" -msgstr "Torを世界に伝えよう" +msgstr "Tor を世界に広める" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.body) msgid "##Tell the world about Tor" -msgstr "## Torについて世界に伝える" +msgstr "## Tor を世界に広める" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.body) @@ -302,14 +299,12 @@ msgstr "Onion サービス" msgid "" "Onion services help you and your users defeat surveillance and censorship. " "Learn how you can deploy onion services." -msgstr "" -"オニオンサービスは、あなたとあなたのユーザーが監視と検閲を打ち負かすのに役立ちます。\n" -"オニオンサービスを展開する方法を学びましょう。" +msgstr "Onion サービスは、あなたとあなたのユーザーが監視と検閲を打ち負かすのに役立ちます。Onion サービスの展開方法をご確認ください。" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.cta) msgid "Grow your .onion" -msgstr "あなたの「.onion」を作成する" +msgstr "「.onion」を作成する" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.body) @@ -329,22 +324,22 @@ msgstr "" #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.title) msgid "User Research" -msgstr "" +msgstr "ユーザーリサーチ" #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.subtitle) msgid "We respect our users' privacy when we conduct research." -msgstr "" +msgstr "ユーザーのプライバシーを尊重しながら、調査を行います。" #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.cta) msgid "Learn about Tor users" -msgstr "" +msgstr "Tor ユーザーについて学ぶ" #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.body) msgid "## We respect our users' privacy when we conduct research." -msgstr "" +msgstr "## ユーザーのプライバシーを尊重しながら、調査を行います。" #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.body) @@ -1184,7 +1179,7 @@ msgstr "##リソース" msgid "" "Do you teach your community about using Tor? These training resources are " "for you." -msgstr "" +msgstr "あなたは、Tor の使用方法についてあなたのコミュニティに教えようとしていますか？こちらのトレーニング用リソースをご活用ください。" #: https//community.torproject.org/localization/translation-problem/ #: (content/localization/translation-problem/contents+en.lrpage.title)

1 0