Skip to content

Commit 2ec7d87

Browse files
authored
Merge pull request #12920 from github/repo-sync
repo sync
2 parents 4a7ef2c + 27abfb9 commit 2ec7d87

42 files changed

Lines changed: 1040 additions & 706 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/content/site-tree.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ describe('siteTree', () => {
2929
})
3030

3131
describe('localized titles', () => {
32-
test('titles for categories', () => {
32+
// skipped because it has rendering errors. See translations/log/ja-resets.csv
33+
test.skip('titles for categories', () => {
3334
const japaneseTitle =
3435
siteTree.ja[nonEnterpriseDefaultVersion].childPages[0].childPages[0].page.title
3536
expect(typeof japaneseTitle).toBe('string')

translations/ja-JP/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To keep your subscriptions manageable, review your subscriptions and watched rep
6363
To customize how you'd like to receive updates for specific pull requests or issues, you can configure your preferences within the issue or pull request. For more information, see "[Triaging a single notification](/github/managing-subscriptions-and-notifications-on-github/triaging-a-single-notification#customizing-when-to-receive-future-updates-for-an-issue-or-pull-request)."
6464

6565
{% ifversion fpt or ghes or ghec %}
66-
You can customize and schedule push notifications in the {% data variables.product.prodname_mobile %} app. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#managing-your-notification-settings-with-github-for-mobile)."
66+
You can customize and schedule push notifications in the {% data variables.product.prodname_mobile %} app. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#managing-your-notification-settings-with-github-mobile)."
6767
{% endif %}
6868

6969
## Reasons for receiving notifications

translations/ja-JP/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The notifications inbox on {% data variables.product.product_location %}{% ifver
5454
- Group notifications in your inbox by repository or date to get a quick overview with less context switching
5555

5656
{% ifversion fpt or ghes or ghec %}
57-
In addition, you can receive and triage notifications on your mobile device with {% data variables.product.prodname_mobile %}. For more information, see "[Managing your notification settings with GitHub for mobile](#managing-your-notification-settings-with-github-for-mobile)" or "[GitHub for mobile](/github/getting-started-with-github/github-for-mobile)."
57+
In addition, you can receive and triage notifications on your mobile device with {% data variables.product.prodname_mobile %}. For more information, see "[Managing your notification settings with GitHub Mobile](#managing-your-notification-settings-with-github-mobile)" or "[GitHub Mobile](/get-started/using-github/github-mobile)."
5858
{% endif %}
5959

6060
### Benefits of using an email client for notifications
Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: プロフィールについて
3-
intro: プロフィールページは、関心のあるリポジトリ、行ったコントリビューション、会話を通じて、あなたの作業の様子を他者に伝えます。
2+
title: About your profile
3+
intro: 'Your profile page tells people the story of your work through the repositories you''re interested in, the contributions you''ve made, and the conversations you''ve had.'
44
redirect_from:
55
- /articles/viewing-your-feeds/
66
- /articles/profile-pages/
@@ -15,30 +15,29 @@ versions:
1515
topics:
1616
- Profiles
1717
---
18-
19-
以前の職場、コントリビュートしたプロジェクト、あなたが興味を持っていることなど、他者が知りたいあなたに関する個人情報を略歴に追加できます。 詳細は「[プロフィールに略歴を追加する](/articles/personalizing-your-profile/#adding-a-bio-to-your-profile)」を参照してください。
18+
You can add personal information about yourself in your bio, like previous places you've worked, projects you've contributed to, or interests you have that other people may like to know about. For more information, see "[Adding a bio to your profile](/articles/personalizing-your-profile/#adding-a-bio-to-your-profile)."
2019

2120
{% ifversion fpt or ghes or ghec %}
2221

2322
{% data reusables.profile.profile-readme %}
2423

25-
![プロフィールに表示されるプロフィール README ファイル](/assets/images/help/repository/profile-with-readme.png)
24+
![Profile README file displayed on profile](/assets/images/help/repository/profile-with-readme.png)
2625

2726
{% endif %}
2827

29-
あなたのプロフィールにアクセスすると、あなたがオープンした Issue やプルリクエスト、行ったコミット、レビューしたプルリクエストなど、あなたのコントリビューションのアクティビティのタイムラインが表示されます。 パブリックコントリビューションだけを表示させることも、プライベートな匿名化されたコントリビューションも表示させることもできます。 詳細は「[プロフィールページ上にコントリビューションを表示する](/articles/viewing-contributions-on-your-profile-page)」または「[プライベートコントリビューションをプロフィールで公開または非公開にする](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)」を参照してください。
28+
People who visit your profile see a timeline of your contribution activity, like issues and pull requests you've opened, commits you've made, and pull requests you've reviewed. You can choose to display only public contributions or to also include private, anonymized contributions. For more information, see "[Viewing contributions on your profile page](/articles/viewing-contributions-on-your-profile-page)" or "[Publicizing or hiding your private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)."
3029

31-
あなたのプロフィールにアクセスしたユーザは、次の情報も見ることができます。
30+
People who visit your profile can also see the following information.
3231

33-
- あなたが所有している、もしくはコントリビューションしたリポジトリと Gist。 {% ifversion fpt or ghes or ghec %}You can showcase your best work by pinning repositories and gists to your profile. 詳細は「[プロフィールにアイテムをピン止めする](/github/setting-up-and-managing-your-github-profile/pinning-items-to-your-profile)」を参照してください。{% endif %}
34-
- Star を付けたリポジトリ。 詳しい情報については、「[Star を付けてリポジトリを保存する](/articles/saving-repositories-with-stars/)」を参照してください。
35-
- あなたが最もアクティブな Organization、リポジトリ、Team でのあなたのアクティビティの概要。 詳しい情報については、「[プロフィール上にアクティビティの概要を表示する](/articles/showing-an-overview-of-your-activity-on-your-profile)」を参照してください。{% ifversion fpt or ghec %}
36-
- {% data variables.product.prodname_pro %} の使用や、{% data variables.product.prodname_arctic_vault %}{% data variables.product.prodname_sponsors %}{% data variables.product.company_short %} 開発者プログラムなどのプログラムへの参加を示すバッジ。 詳細は「[プロフィールをパーソナライズする](/github/setting-up-and-managing-your-github-profile/personalizing-your-profile#displaying-badges-on-your-profile)」を参照してください。{% endif %}
32+
- Repositories and gists you own or contribute to. {% ifversion fpt or ghes or ghec %}You can showcase your best work by pinning repositories and gists to your profile. For more information, see "[Pinning items to your profile](/github/setting-up-and-managing-your-github-profile/pinning-items-to-your-profile)."{% endif %}
33+
- Repositories you've starred{% ifversion fpt or ghec %} and organized into lists.{% endif %} For more information, see "[Saving repositories with stars](/articles/saving-repositories-with-stars/)."
34+
- An overview of your activity in organizations, repositories, and teams you're most active in. For more information, see "[Showing an overview of your activity on your profile](/articles/showing-an-overview-of-your-activity-on-your-profile)."{% ifversion fpt or ghec %}
35+
- Badges that show if you use {% data variables.product.prodname_pro %} or participate in programs like the {% data variables.product.prodname_arctic_vault %}, {% data variables.product.prodname_sponsors %}, or the {% data variables.product.company_short %} Developer Program. For more information, see "[Personalizing your profile](/github/setting-up-and-managing-your-github-profile/personalizing-your-profile#displaying-badges-on-your-profile)."{% endif %}
3736

38-
プロフィールにステータスを設定して、可用性に関する情報を提供することもできます。 詳細は「[ステータスを設定する](/articles/personalizing-your-profile/#setting-a-status)」を参照してください。
37+
You can also set a status on your profile to provide information about your availability. For more information, see "[Setting a status](/articles/personalizing-your-profile/#setting-a-status)."
3938

40-
## 参考リンク
39+
## Further reading
4140

42-
- [プロフィール画像のセットアップ方法](/articles/how-do-i-set-up-my-profile-picture)
43-
- [プロフィールでプライベートコントリビューションを公開または非表示にする](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)
44-
- [プロフィール上でのコントリビューションの表示](/articles/viewing-contributions-on-your-profile)
41+
- "[How do I set up my profile picture?](/articles/how-do-i-set-up-my-profile-picture)"
42+
- "[Publicizing or hiding your private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)"
43+
- "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)"

translations/ja-JP/content/actions/learn-github-actions/workflow-syntax-for-github-actions.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,10 @@ A boolean specifying whether the secret must be supplied.
294294

295295
When using the `workflow_dispatch` event, you can optionally specify inputs that are passed to the workflow.
296296

297+
The triggered workflow receives the inputs in the `github.event.inputs` context. For more information, see "[Contexts](/actions/learn-github-actions/contexts#github-context)."
298+
299+
### Example
300+
{% raw %}
297301
```yaml
298302
on:
299303
workflow_dispatch:
@@ -315,9 +319,16 @@ on:
315319
description: 'Environment to run tests against'
316320
type: environment
317321
required: true {% endif %}
318-
```
322+
323+
jobs:
324+
print-tag:
325+
runs-on: ubuntu-latest
319326
320-
The triggered workflow receives the inputs in the `github.event.inputs` context. For more information, see "[Contexts](/actions/learn-github-actions/contexts#github-context)."
327+
steps:
328+
- name: Print the input tag to STDOUT
329+
run: echo The tag is ${{ github.event.inputs.tag }}
330+
```
331+
{% endraw %}
321332

322333
## `on.schedule`
323334

translations/ja-JP/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ After you enable LDAP sync, a synchronization job will run at the specified time
132132

133133
{% note %}
134134

135-
**Note**: LDAP entries can only be marked as disabled if you use Active Directory and the `userAccountControl` attribute is present and flagged with `ACCOUNTDISABLE`.
135+
**Note**: LDAP entries can only be marked as disabled if you use Active Directory and the `userAccountControl` attribute is present and flagged with `ACCOUNTDISABLE`. Some variations of Active Directory, such as AD LDS and ADAM, don't support the `userAccountControl` attribute.
136136

137137
{% endnote %}
138138

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: GitHub Enterprise Server でロードバランサを使用する
3-
intro: 'ロードバランサを、単一の {% data variables.product.prodname_ghe_server %} アプライアンス、あるいは High Availability 構成のアプライアンスのペアの前で使ってください。'
2+
title: Using GitHub Enterprise Server with a load balancer
3+
intro: 'Use a load balancer in front of a single {% data variables.product.prodname_ghe_server %} appliance or a pair of appliances in a High Availability configuration.'
44
redirect_from:
55
- /enterprise/admin/guides/installation/using-github-enterprise-with-a-load-balancer/
66
- /enterprise/admin/installation/using-github-enterprise-server-with-a-load-balancer
@@ -17,31 +17,36 @@ topics:
1717
shortTitle: Use a load balancer
1818
---
1919

20+
## About load balancers
21+
2022
{% data reusables.enterprise_clustering.load_balancer_intro %}
2123

2224
{% data reusables.enterprise_clustering.load_balancer_dns %}
2325

24-
## クライアントの接続情報の処理
26+
## Handling client connection information
2527

26-
{% data variables.product.prodname_ghe_server %} へのクライアント接続はロードバランサから来ることになるため、クライアントの IP アドレスは失われることがあります。
28+
Because client connections to {% data variables.product.prodname_ghe_server %} come from the load balancer, the client IP address can be lost.
2729

2830
{% data reusables.enterprise_clustering.proxy_preference %}
2931

3032
{% data reusables.enterprise_clustering.proxy_xff_firewall_warning %}
3133

32-
### {% data variables.product.product_location %}でのPROXYプロトコルサポートの有効化
34+
### Enabling PROXY protocol support on {% data variables.product.product_location %}
35+
36+
We strongly recommend enabling PROXY protocol support for both your appliance and the load balancer. Use the instructions provided by your vendor to enable the PROXY protocol on your load balancer. For more information, see [the PROXY protocol documentation](http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt).
3337

34-
アプライアンスとロードバランサの両方でPROXYプロトコルサポートを有効化することを強くおすすめします。 ロードバランサでPROXYプロトコルを有効化する方法については、ベンダーが提供する指示に従ってください。 詳しい情報については[PROXY プロトコルのドキュメンテーション](http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt)を参照してください。
38+
{% data reusables.enterprise_installation.proxy-incompatible-with-aws-nlbs %}
3539

3640
{% data reusables.enterprise_site_admin_settings.access-settings %}
3741
{% data reusables.enterprise_site_admin_settings.management-console %}
3842
{% data reusables.enterprise_management_console.privacy %}
39-
3. **External load balancers(外部ロードバランサ)**の下で**Enable support for PROXY protocol(PROXYプロトコルサポートの有効化)**を選択してください。 ![PROXY プロトコルを有効化するチェックボックス](/assets/images/enterprise/management-console/enable-proxy.png)
43+
3. Under **External load balancers**, select **Enable support for PROXY protocol**.
44+
![Checkbox to enable support for PROXY protocol](/assets/images/enterprise/management-console/enable-proxy.png)
4045
{% data reusables.enterprise_management_console.save-settings %}
4146

4247
{% data reusables.enterprise_clustering.proxy_protocol_ports %}
4348

44-
### {% data variables.product.product_location %}でのX-Forwarded-Forサポートの有効化
49+
### Enabling X-Forwarded-For support on {% data variables.product.product_location %}
4550

4651
{% data reusables.enterprise_clustering.x-forwarded-for %}
4752

@@ -50,14 +55,15 @@ shortTitle: Use a load balancer
5055
{% data reusables.enterprise_site_admin_settings.access-settings %}
5156
{% data reusables.enterprise_site_admin_settings.management-console %}
5257
{% data reusables.enterprise_management_console.privacy %}
53-
3. **External load balancers(外部ロードバランサ)**の下で**Allow HTTP X-Forwarded-For header(HTTP X-Forwarded-Forヘッダの許可)**を選択してください。 ![HTTP X-Forwarded-For ヘッダを許可するチェックボックス](/assets/images/enterprise/management-console/allow-xff.png)
58+
3. Under **External load balancers**, select **Allow HTTP X-Forwarded-For header**.
59+
![Checkbox to allow the HTTP X-Forwarded-For header](/assets/images/enterprise/management-console/allow-xff.png)
5460
{% data reusables.enterprise_management_console.save-settings %}
5561

5662
{% data reusables.enterprise_clustering.without_proxy_protocol_ports %}
5763

58-
## 健全性チェックの設定
64+
## Configuring health checks
5965

60-
ロードバランサは健全性チェックによって、事前に設定されたチェックが失敗するようになったノードがあれば、反応しなくなったノードへのトラフィックの送信を止めます。 メンテナンスもしくは予想外の障害のためにアプライアンスがオフラインになっているなら、ロードバランサはステータスページを表示できます。 High Availability(HA)設定では、ロードバランサはフェイルオーバーの戦略の一部として利用できます。 ただし、HAペアの自動フェイルオーバーはサポートされていません。 レプリカインスタンスは、手動で昇格させるとリクエストに応えられるようになります。 詳細は「[High Availability 用に {% data variables.product.prodname_ghe_server %} を設定する](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability/)」を参照してください。
66+
Health checks allow a load balancer to stop sending traffic to a node that is not responding if a pre-configured check fails on that node. If the appliance is offline due to maintenance or unexpected failure, the load balancer can display a status page. In a High Availability (HA) configuration, a load balancer can be used as part of a failover strategy. However, automatic failover of HA pairs is not supported. You must manually promote the replica appliance before it will begin serving requests. For more information, see "[Configuring {% data variables.product.prodname_ghe_server %} for High Availability](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability/)."
6167

6268
{% data reusables.enterprise_clustering.health_checks %}
6369
{% data reusables.enterprise_site_admin_settings.maintenance-mode-status %}

translations/ja-JP/content/admin/configuration/configuring-your-enterprise/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ children:
2323
- /configuring-backups-on-your-appliance
2424
- /site-admin-dashboard
2525
- /enabling-private-mode
26-
- /managing-github-for-mobile-for-your-enterprise
26+
- /managing-github-mobile-for-your-enterprise
2727
- /configuring-email-for-notifications
2828
- /verifying-or-approving-a-domain-for-your-enterprise
2929
- /configuring-rate-limits

0 commit comments

Comments
 (0)