Skip to content
This repository has been archived by the owner on Aug 11, 2022. It is now read-only.

Commit

Permalink
feat: update source content
Browse files Browse the repository at this point in the history
  • Loading branch information
electron-bot committed Sep 28, 2021
1 parent a50e044 commit 54da1b8
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion content/en-US/docs/breaking-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ error.
### API Changed: `shell.openItem` is now `shell.openPath`

The `shell.openItem` API has been replaced with an asynchronous `shell.openPath` API.
You can see the original API proposal and reasoning [here](https://github.com/electron/governance/blob/master/wg-api/spec-documents/shell-openitem.md).
You can see the original API proposal and reasoning [here](https://github.com/electron/governance/blob/main/wg-api/spec-documents/shell-openitem.md).

## Planned Breaking API Changes (8.0)

Expand Down
4 changes: 2 additions & 2 deletions content/en-US/docs/development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ These guides are intended for people working on the Electron project itself.
For guides on Electron app development, see
[/docs/README.md](../README.md#guides-and-tutorials).

* [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md)
* [Contributing to Electron](https://github.com/electron/electron/blob/master/CONTRIBUTING.md)
* [Code of Conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md)
* [Contributing to Electron](https://github.com/electron/electron/blob/main/CONTRIBUTING.md)
* [Issues](issues.md)
* [Pull Requests](pull-requests.md)
* [Documentation Styleguide](coding-style.md#documentation)
Expand Down
2 changes: 1 addition & 1 deletion content/en-US/docs/development/azure-vm-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Example Use Case:
* We need `VS15.9` and we have `VS15.7` installed; this would require us to update an Azure image.

1. Identify the image you wish to modify.
* In [appveyor.yml](https://github.com/electron/electron/blob/master/appveyor.yml), the image is identified by the property *image*.
* In [appveyor.yml](https://github.com/electron/electron/blob/main/appveyor.yml), the image is identified by the property *image*.
* The names used correspond to the *"images"* defined for a build cloud, eg the [libcc-20 cloud](https://windows-ci.electronjs.org/build-clouds/8).
* Find the image you wish to modify in the build cloud and make note of the **VHD Blob Path** for that image, which is the value for that corresponding key.
* You will need this URI path to copy into a new image.
Expand Down
4 changes: 2 additions & 2 deletions content/en-US/docs/development/build-instructions-gn.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ origin URLs.
$ cd src/electron
$ git remote remove origin
$ git remote add origin https://github.com/electron/electron
$ git checkout master
$ git branch --set-upstream-to=origin/master
$ git checkout main
$ git branch --set-upstream-to=origin/main
$ cd -
```

Expand Down
2 changes: 1 addition & 1 deletion content/en-US/docs/development/electron-vs-nwjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ to try NW.js.

[nwjs]: https://nwjs.io/
[electron-modules]: https://www.npmjs.com/search?q=electron
[node-bindings]: https://github.com/electron/electron/tree/master/lib/common
[node-bindings]: https://github.com/electron/electron/tree/main/lib/common
12 changes: 6 additions & 6 deletions content/en-US/docs/development/pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ Once you've built the project locally, you're ready to start making changes!
### Step 3: Branch

To keep your development environment organized, create local branches to
hold your work. These should be branched directly off of the `master` branch.
hold your work. These should be branched directly off of the `main` branch.

```sh
$ git checkout -b my-branch -t upstream/master
$ git checkout -b my-branch -t upstream/main
```

## Making Changes
Expand Down Expand Up @@ -134,11 +134,11 @@ Once you have committed your changes, it is a good idea to use `git rebase`

```sh
$ git fetch upstream
$ git rebase upstream/master
$ git rebase upstream/main
```

This ensures that your working branch has the latest changes from `electron/electron`
master.
main.

### Step 7: Test

Expand Down Expand Up @@ -189,7 +189,7 @@ the requirements below.

Bug fixes and new features should include tests and possibly benchmarks.

Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTING.md
Contributors guide: https://github.com/electron/electron/blob/main/CONTRIBUTING.md
-->
```

Expand Down Expand Up @@ -222,7 +222,7 @@ seem unfamiliar, refer to this
#### Approval and Request Changes Workflow

All pull requests require approval from a
[Code Owner](https://github.com/electron/electron/blob/master/.github/CODEOWNERS)
[Code Owner](https://github.com/electron/electron/blob/main/.github/CODEOWNERS)
of the area you modified in order to land. Whenever a maintainer reviews a pull
request they may request changes. These may be small, such as fixing a typo, or
may involve substantive changes. Such requests are intended to be helpful, but
Expand Down
2 changes: 1 addition & 1 deletion content/en-US/docs/tutorial/fuses.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ Somewhere in the Electron binary there will be a sequence of bytes that look lik

To flip a fuse you find its position in the fuse wire and change it to "0" or "1" depending on the state you'd like.

You can view the current schema [here](https://github.com/electron/electron/blob/master/build/fuses/fuses.json5).
You can view the current schema [here](https://github.com/electron/electron/blob/main/build/fuses/fuses.json5).
2 changes: 1 addition & 1 deletion content/en-US/docs/tutorial/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ your responsibility to ensure that the code is not malicious.
## Reporting Security Issues

For information on how to properly disclose an Electron vulnerability,
see [SECURITY.md](https://github.com/electron/electron/tree/master/SECURITY.md)
see [SECURITY.md](https://github.com/electron/electron/tree/main/SECURITY.md)

## Chromium Security Issues and Upgrades

Expand Down
10 changes: 5 additions & 5 deletions content/en-US/docs/tutorial/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Finding Support

If you have a security concern,
please see the [security document](https://github.com/electron/electron/tree/master/SECURITY.md).
please see the [security document](https://github.com/electron/electron/tree/main/SECURITY.md).

If you're looking for programming help,
for answers to questions,
Expand All @@ -26,7 +26,7 @@ you can interact with the community in these locations:
* [`electron-pl`](https://electronpl.github.io) *(Poland)*

If you'd like to contribute to Electron,
see the [contributing document](https://github.com/electron/electron/blob/master/CONTRIBUTING.md).
see the [contributing document](https://github.com/electron/electron/blob/main/CONTRIBUTING.md).

If you've found a bug in a [supported version](#supported-versions) of Electron,
please report it with the [issue tracker](../development/issues.md).
Expand All @@ -50,15 +50,15 @@ as the 4.2.x series are supported. We only support the latest minor release
for each stable release series. This means that in the case of a security fix
6.1.x will receive the fix, but we will not release a new version of 6.0.x.

The latest stable release unilaterally receives all fixes from `master`,
The latest stable release unilaterally receives all fixes from `main`,
and the version prior to that receives the vast majority of those fixes
as time and bandwidth warrants. The oldest supported release line will receive
only security fixes directly.

All supported release lines will accept external pull requests to backport
fixes previously merged to `master`, though this may be on a case-by-case
fixes previously merged to `main`, though this may be on a case-by-case
basis for some older supported lines. All contested decisions around release
line backports will be resolved by the [Releases Working Group](https://github.com/electron/governance/tree/master/wg-releases) as an agenda item at their weekly meeting the week the backport PR is raised.
line backports will be resolved by the [Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases) as an agenda item at their weekly meeting the week the backport PR is raised.

When an API is changed or removed in a way that breaks existing functionality, the
previous functionality will be supported for a minimum of two major versions when
Expand Down
100 changes: 50 additions & 50 deletions stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +2,92 @@
{
"name": "Chinese Simplified",
"code": "zh-CN",
"phrases": "14733",
"translated": "9075",
"approved": "8219",
"words": "160327",
"words_translated": "91192",
"words_approved": "81878",
"translated_progress": 56,
"approved_progress": 51,
"qa_issues": 19
"phrases": "14771",
"translated": "9269",
"approved": "8223",
"words": "160812",
"words_translated": "93165",
"words_approved": "81935",
"translated_progress": 57,
"approved_progress": 50,
"qa_issues": 20
},
{
"name": "French",
"code": "fr",
"phrases": "14733",
"translated": "8394",
"approved": "8133",
"words": "160327",
"words_translated": "78198",
"words_approved": "76328",
"phrases": "14771",
"translated": "8421",
"approved": "8138",
"words": "160812",
"words_translated": "78568",
"words_approved": "76386",
"translated_progress": 48,
"approved_progress": 47,
"qa_issues": 87
"qa_issues": 92
},
{
"name": "German",
"code": "de",
"phrases": "14733",
"translated": "3503",
"approved": "3328",
"words": "160327",
"words_translated": "25666",
"words_approved": "23426",
"phrases": "14771",
"translated": "3515",
"approved": "3332",
"words": "160812",
"words_translated": "25820",
"words_approved": "23483",
"translated_progress": 16,
"approved_progress": 14,
"qa_issues": 87
"qa_issues": 91
},
{
"name": "Japanese",
"code": "ja",
"phrases": "14733",
"translated": "14733",
"approved": "14318",
"words": "160327",
"words_translated": "160327",
"words_approved": "155304",
"phrases": "14771",
"translated": "14771",
"approved": "14324",
"words": "160812",
"words_translated": "160812",
"words_approved": "155363",
"translated_progress": 100,
"approved_progress": 96,
"qa_issues": 25
},
{
"name": "Portuguese, Brazilian",
"code": "pt-BR",
"phrases": "14733",
"translated": "3617",
"approved": "3576",
"words": "160327",
"words_translated": "30619",
"words_approved": "30030",
"phrases": "14771",
"translated": "3632",
"approved": "3579",
"words": "160812",
"words_translated": "30780",
"words_approved": "30071",
"translated_progress": 19,
"approved_progress": 18,
"qa_issues": 8
"qa_issues": 15
},
{
"name": "Russian",
"code": "ru",
"phrases": "14733",
"translated": "6440",
"approved": "6282",
"words": "160327",
"words_translated": "58543",
"words_approved": "56532",
"phrases": "14771",
"translated": "6460",
"approved": "6286",
"words": "160812",
"words_translated": "58790",
"words_approved": "56574",
"translated_progress": 36,
"approved_progress": 35,
"qa_issues": 63
"qa_issues": 68
},
{
"name": "Spanish",
"code": "es-ES",
"phrases": "14733",
"translated": "9735",
"approved": "9628",
"words": "160327",
"words_translated": "96347",
"words_approved": "95375",
"phrases": "14771",
"translated": "9799",
"approved": "9633",
"words": "160812",
"words_translated": "97236",
"words_approved": "95433",
"translated_progress": 60,
"approved_progress": 59,
"qa_issues": 31
"qa_issues": 55
}
]
4 changes: 2 additions & 2 deletions wordcount.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ average words per file | 771
Stat | Value
---- | -----
total files | 1730
total words | 1249850
unique words | 53509
total words | 1250757
unique words | 53611
average words per file | 722

0 comments on commit 54da1b8

Please sign in to comment.