From 54da1b8cc014f72ce29d39c9c9cc4f748570a1cf Mon Sep 17 00:00:00 2001 From: electron-bot Date: Tue, 28 Sep 2021 12:02:11 +0000 Subject: [PATCH] feat: update source content --- content/en-US/docs/breaking-changes.md | 2 +- content/en-US/docs/development/README.md | 4 +- .../en-US/docs/development/azure-vm-setup.md | 2 +- .../docs/development/build-instructions-gn.md | 4 +- .../docs/development/electron-vs-nwjs.md | 2 +- .../en-US/docs/development/pull-requests.md | 12 +-- content/en-US/docs/tutorial/fuses.md | 2 +- content/en-US/docs/tutorial/security.md | 2 +- content/en-US/docs/tutorial/support.md | 10 +- stats.json | 100 +++++++++--------- wordcount.md | 4 +- 11 files changed, 72 insertions(+), 72 deletions(-) diff --git a/content/en-US/docs/breaking-changes.md b/content/en-US/docs/breaking-changes.md index c7879ffd1d33d..648473f4c22d3 100644 --- a/content/en-US/docs/breaking-changes.md +++ b/content/en-US/docs/breaking-changes.md @@ -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) diff --git a/content/en-US/docs/development/README.md b/content/en-US/docs/development/README.md index f5c9d6073fa1f..c472d8f485f6e 100644 --- a/content/en-US/docs/development/README.md +++ b/content/en-US/docs/development/README.md @@ -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) diff --git a/content/en-US/docs/development/azure-vm-setup.md b/content/en-US/docs/development/azure-vm-setup.md index c69aa5a064288..477e9ee781de0 100644 --- a/content/en-US/docs/development/azure-vm-setup.md +++ b/content/en-US/docs/development/azure-vm-setup.md @@ -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. diff --git a/content/en-US/docs/development/build-instructions-gn.md b/content/en-US/docs/development/build-instructions-gn.md index cfea03e8c2e34..9ea0e419fb5a5 100644 --- a/content/en-US/docs/development/build-instructions-gn.md +++ b/content/en-US/docs/development/build-instructions-gn.md @@ -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 - ``` diff --git a/content/en-US/docs/development/electron-vs-nwjs.md b/content/en-US/docs/development/electron-vs-nwjs.md index cb5ffcea8e376..aeb08ab0eac2e 100644 --- a/content/en-US/docs/development/electron-vs-nwjs.md +++ b/content/en-US/docs/development/electron-vs-nwjs.md @@ -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 diff --git a/content/en-US/docs/development/pull-requests.md b/content/en-US/docs/development/pull-requests.md index 8486c5cf824e7..f58ceee1a87d3 100644 --- a/content/en-US/docs/development/pull-requests.md +++ b/content/en-US/docs/development/pull-requests.md @@ -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 @@ -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 @@ -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 --> ``` @@ -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 diff --git a/content/en-US/docs/tutorial/fuses.md b/content/en-US/docs/tutorial/fuses.md index 90a039a530f7b..f3563e35ed892 100644 --- a/content/en-US/docs/tutorial/fuses.md +++ b/content/en-US/docs/tutorial/fuses.md @@ -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). diff --git a/content/en-US/docs/tutorial/security.md b/content/en-US/docs/tutorial/security.md index 55129495ca9d2..6558456b4d0a0 100644 --- a/content/en-US/docs/tutorial/security.md +++ b/content/en-US/docs/tutorial/security.md @@ -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 diff --git a/content/en-US/docs/tutorial/support.md b/content/en-US/docs/tutorial/support.md index 601cb6c8b390f..f32258cb16f9c 100644 --- a/content/en-US/docs/tutorial/support.md +++ b/content/en-US/docs/tutorial/support.md @@ -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, @@ -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). @@ -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 diff --git a/stats.json b/stats.json index 174f85940c0d0..b8080c2993c3e 100644 --- a/stats.json +++ b/stats.json @@ -2,51 +2,51 @@ { "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 @@ -54,40 +54,40 @@ { "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 } ] \ No newline at end of file diff --git a/wordcount.md b/wordcount.md index 6a9df081af9d6..fe7ad99a7a74c 100644 --- a/wordcount.md +++ b/wordcount.md @@ -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