feat(sync): Synchronize updates a170ddead89f1bc821f7bab2696ab2af07f89530

gouzil · Nov 13, 2022 · 778afae · 778afae
1 parent 2f1f472
commit 778afae
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 4 deletions.
diff --git a/Original-README-ZH.md b/Original-README-ZH.md
@@ -7,7 +7,7 @@ GitHub app. 它是用 [TypeScript](https://www.typescriptlang.org) 和 [React](h
 
 ## 这是一个什么项目？
 
-这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.0](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.0)
+这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.1](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.1)
 
 ## 在哪里可以下载到?
 

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@
 
 ## 这是一个什么项目？
 
-这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.0](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.0)
+这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.1](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.1)
 
 ## 部分截图
 

diff --git a/app/package.json b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "./main.js",
   "repository": {
     "type": "git",

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -5206,7 +5206,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   public _setConfirmUndoCommitSetting(value: boolean): Promise<void> {
     this.confirmUndoCommit = value
-    setBoolean(confirmForcePushKey, value)
+    setBoolean(confirmUndoCommitKey, value)
 
     this.emitUpdate()
 

diff --git a/changelog.json b/changelog.json
@@ -1,5 +1,8 @@
 {
   "releases": {
+    "3.1.1": [
+      "[Fixed] App correctly remembers undo commit prompt setting - #15408"
+    ],
     "3.1.0": [
       "[Added] You can diff a consecutive range of commits - #14682",
       "[Added] Submodule changes now display an explanatory, interactive diff screen - #15176",

diff --git a/docs/images/image1.png b/docs/images/image1.png
diff --git a/docs/images/image2.png b/docs/images/image2.png
diff --git a/docs/images/image3.png b/docs/images/image3.png