diff --git a/content/current/en-US/docs/tutorial/electron-versioning.md b/content/current/en-US/docs/tutorial/electron-versioning.md index 91d05759289b0..5bd625e44a6fc 100644 --- a/content/current/en-US/docs/tutorial/electron-versioning.md +++ b/content/current/en-US/docs/tutorial/electron-versioning.md @@ -57,7 +57,7 @@ Stabilization branches are branches that run parallel to master, taking in only ![](../images/versioning-sketch-1.png) -Stabilization branches are always either **major** or **minor** version lines, and named against the following template `$MAJOR-$MINOR-x` e.g. `2-0-x`. +Since Electron 8, stabilization branches are always **major** version lines, and named against the following template `$MAJOR-x-y` e.g. `8-x-y`. Prior to that we used **minor** version lines and named them as `$MAJOR-$MINOR-x` e.g. `2-0-x` We allow for multiple stabilization branches to exist simultaneously, and intend to support at least two in parallel at all times, backporting security fixes as necessary. ![](../images/versioning-sketch-2.png) diff --git a/package.json b/package.json index 3a949558f8f12..2c4124b2b1920 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "automerge": "ts-node ./script/automerge.ts" }, "electronLatestStableTag": "v8.2.3", - "electronMasterBranchCommit": "f3dc3997b10fd79439ad22ff5973b3d3541d8e9d", + "electronMasterBranchCommit": "aca2e4f96896f7f715cd582a631ba84f71c25a4f", "engines": { "node": ">=10" }, diff --git a/stats.json b/stats.json index 1bce82fcc7c37..63d6c8fad7269 100644 --- a/stats.json +++ b/stats.json @@ -94,14 +94,14 @@ "name": "French", "code": "fr", "phrases": "65629", - "translated": "43561", + "translated": "43563", "approved": "34946", "words": "630652", - "words_translated": "368166", + "words_translated": "368192", "words_approved": "292927", "translated_progress": 58, "approved_progress": 46, - "qa_issues": 2098 + "qa_issues": 2099 }, { "name": "German", @@ -185,14 +185,14 @@ "name": "Korean", "code": "ko", "phrases": "65629", - "translated": "28242", + "translated": "28266", "approved": "21807", "words": "630652", - "words_translated": "242946", + "words_translated": "243071", "words_approved": "180680", "translated_progress": 38, "approved_progress": 28, - "qa_issues": 2404 + "qa_issues": 2411 }, { "name": "Persian", @@ -250,14 +250,14 @@ "name": "Russian", "code": "ru", "phrases": "65629", - "translated": "40740", + "translated": "40792", "approved": "35120", "words": "630652", - "words_translated": "335885", + "words_translated": "336287", "words_approved": "288805", "translated_progress": 53, "approved_progress": 45, - "qa_issues": 1794 + "qa_issues": 1807 }, { "name": "Spanish", diff --git a/wordcount.md b/wordcount.md index 0b3b038749b16..7d8869d7489d7 100644 --- a/wordcount.md +++ b/wordcount.md @@ -5,8 +5,8 @@ Stat | Value ---- | ----- total files | 272 -total words | 262599 -unique words | 12503 +total words | 262619 +unique words | 12504 average words per file | 965 ## Blog English @@ -23,6 +23,6 @@ average words per file | 702 Stat | Value ---- | ----- total files | 7259 -total words | 5448699 -unique words | 93831 +total words | 5448719 +unique words | 93832 average words per file | 750