feat(sync): Synchronize updates 2ada979c208db2d185aa953f71015fb81f27acca

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16.13.0]
+        node: [16.17.1]
         os: [macos-11, windows-2019]
         arch: [x64, arm64]
         include:
@@ -61,6 +61,8 @@ jobs:
         env:
           npm_config_arch: ${{ matrix.arch }}
           TARGET_ARCH: ${{ matrix.arch }}
+      - name: Validate Electron version
+        run: yarn run validate-electron-version
       - name: Lint
         run: yarn lint
       - name: Validate changelog

.node-version

@@ -1 +1 @@
-16.13.0
+16.17.1

.nvmrc

@@ -1 +1 @@
-v16.13.0
+v16.17.1

.tool-versions

@@ -1,2 +1,2 @@
 python 3.9.5
-nodejs 16.13.0
+nodejs 16.17.1

Original-README-ZH.md

@@ -17,7 +17,7 @@ GitHub app. 它是用 [TypeScript](https://www.typescriptlang.org) 和 [React](h
 
 ## 这是一个什么项目？
 
-这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.5](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.5)
+这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.8](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.8)
 
 ## 在哪里可以下载到?
 

README.md

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

app/.npmrc

@@ -1,3 +1,3 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 19.0.0
+target = 22.0.0

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "main": "./main.js",
   "repository": {
     "type": "git",

app/src/lib/app-state.ts

@@ -327,6 +327,7 @@ export enum FoldoutType {
   Branch,
   AppMenu,
   AddMenu,
+  PushPull,
 }
 
 export type AppMenuFoldout = {
@@ -358,6 +359,7 @@ export type Foldout =
   | { type: FoldoutType.AddMenu }
   | BranchFoldout
   | AppMenuFoldout
+  | { type: FoldoutType.PushPull }
 
 export enum RepositorySectionTab {
   Changes,

app/src/lib/editors/darwin.ts

@@ -91,6 +91,10 @@ const editors: IDarwinExternalEditor[] = [
     name: 'WebStorm',
     bundleIdentifiers: ['com.jetbrains.WebStorm'],
   },
+  {
+    name: 'CLion',
+    bundleIdentifiers: ['com.jetbrains.CLion'],
+  },
   {
     name: 'Typora',
     bundleIdentifiers: ['abnerworks.Typora'],

app/src/lib/editors/win32.ts

@@ -59,7 +59,7 @@ type WindowsExternalEditor = {
   readonly displayNamePrefix: string
 
   /** Value of the Publisher registry key that belongs to this editor. */
-  readonly publisher: string
+  readonly publishers: string[]
 
   /**
    * Default shell script name for JetBrains Product
@@ -150,21 +150,21 @@ const editors: WindowsExternalEditor[] = [
     registryKeys: [CurrentUserUninstallKey('atom')],
     executableShimPaths: [['bin', 'atom.cmd']],
     displayNamePrefix: 'Atom',
-    publisher: 'GitHub Inc.',
+    publishers: ['GitHub Inc.'],
   },
   {
     name: 'Atom Beta',
     registryKeys: [CurrentUserUninstallKey('atom-beta')],
     executableShimPaths: [['bin', 'atom-beta.cmd']],
     displayNamePrefix: 'Atom Beta',
-    publisher: 'GitHub Inc.',
+    publishers: ['GitHub Inc.'],
   },
   {
     name: 'Atom Nightly',
     registryKeys: [CurrentUserUninstallKey('atom-nightly')],
     executableShimPaths: [['bin', 'atom-nightly.cmd']],
     displayNamePrefix: 'Atom Nightly',
-    publisher: 'GitHub Inc.',
+    publishers: ['GitHub Inc.'],
   },
   {
     name: 'Visual Studio Code',
@@ -186,7 +186,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['bin', 'code.cmd']],
     displayNamePrefix: 'Microsoft Visual Studio Code',
-    publisher: 'Microsoft Corporation',
+    publishers: ['Microsoft Corporation'],
   },
   {
     name: 'Visual Studio Code (Insiders)',
@@ -208,29 +208,63 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['bin', 'code-insiders.cmd']],
     displayNamePrefix: 'Microsoft Visual Studio Code Insiders',
-    publisher: 'Microsoft Corporation',
+    publishers: ['Microsoft Corporation'],
   },
   {
     name: 'Visual Studio Codium',
     registryKeys: [
       // 64-bit version of VSCodium (user)
       CurrentUserUninstallKey('{2E1F05D1-C245-4562-81EE-28188DB6FD17}_is1'),
-      // 32-bit version of VSCodium (user)
+      // 32-bit version of VSCodium (user) - new key
+      CurrentUserUninstallKey('{0FD05EB4-651E-4E78-A062-515204B47A3A}_is1'),
+      // ARM64 version of VSCodium (user) - new key
+      CurrentUserUninstallKey('{57FD70A5-1B8D-4875-9F40-C5553F094828}_is1'),
+      // 64-bit version of VSCodium (system) - new key
+      LocalMachineUninstallKey('{88DA3577-054F-4CA1-8122-7D820494CFFB}_is1'),
+      // 32-bit version of VSCodium (system) - new key
+      Wow64LocalMachineUninstallKey(
+        '{763CBF88-25C6-4B10-952F-326AE657F16B}_is1'
+      ),
+      // ARM64 version of VSCodium (system) - new key
+      LocalMachineUninstallKey('{67DEE444-3D04-4258-B92A-BC1F0FF2CAE4}_is1'),
+      // 32-bit version of VSCodium (user) - old key
       CurrentUserUninstallKey('{C6065F05-9603-4FC4-8101-B9781A25D88E}}_is1'),
-      // ARM64 version of VSCodium (user)
+      // ARM64 version of VSCodium (user) - old key
       CurrentUserUninstallKey('{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}_is1'),
-      // 64-bit version of VSCodium (system)
+      // 64-bit version of VSCodium (system) - old key
       LocalMachineUninstallKey('{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}_is1'),
-      // 32-bit version of VSCodium (system)
+      // 32-bit version of VSCodium (system) - old key
       Wow64LocalMachineUninstallKey(
         '{E34003BB-9E10-4501-8C11-BE3FAA83F23F}_is1'
       ),
-      // ARM64 version of VSCodium (system)
+      // ARM64 version of VSCodium (system) - old key
       LocalMachineUninstallKey('{D1ACE434-89C5-48D1-88D3-E2991DF85475}_is1'),
     ],
     executableShimPaths: [['bin', 'codium.cmd']],
     displayNamePrefix: 'VSCodium',
-    publisher: 'Microsoft Corporation',
+    publishers: ['VSCodium', 'Microsoft Corporation'],
+  },
+  {
+    name: 'Visual Studio Codium (Insiders)',
+    registryKeys: [
+      // 64-bit version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{20F79D0D-A9AC-4220-9A81-CE675FFB6B41}_is1'),
+      // 32-bit version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{ED2E5618-3E7E-4888-BF3C-A6CCC84F586F}_is1'),
+      // ARM64 version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{2E362F92-14EA-455A-9ABD-3E656BBBFE71}_is1'),
+      // 64-bit version of VSCodium - Insiders (system)
+      LocalMachineUninstallKey('{B2E0DDB2-120E-4D34-9F7E-8C688FF839A2}_is1'),
+      // 32-bit version of VSCodium - Insiders (system)
+      Wow64LocalMachineUninstallKey(
+        '{EF35BB36-FA7E-4BB9-B7DA-D1E09F2DA9C9}_is1'
+      ),
+      // ARM64 version of VSCodium - Insiders (system)
+      LocalMachineUninstallKey('{44721278-64C6-4513-BC45-D48E07830599}_is1'),
+    ],
+    executableShimPaths: [['bin', 'codium-insiders.cmd']],
+    displayNamePrefix: 'VSCodium (Insiders)',
+    publishers: ['VSCodium'],
   },
   {
     name: 'Sublime Text',
@@ -242,7 +276,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['subl.exe']],
     displayNamePrefix: 'Sublime Text',
-    publisher: 'Sublime HQ Pty Ltd',
+    publishers: ['Sublime HQ Pty Ltd'],
   },
   {
     name: 'Brackets',
@@ -251,7 +285,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['Brackets.exe']],
     displayNamePrefix: 'Brackets',
-    publisher: 'brackets.io',
+    publishers: ['brackets.io'],
   },
   {
     name: 'ColdFusion Builder',
@@ -263,7 +297,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['CFBuilder.exe']],
     displayNamePrefix: 'Adobe ColdFusion Builder',
-    publisher: 'Adobe Systems Incorporated',
+    publishers: ['Adobe Systems Incorporated'],
   },
   {
     name: 'Typora',
@@ -277,7 +311,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['typora.exe']],
     displayNamePrefix: 'Typora',
-    publisher: 'typora.io',
+    publishers: ['typora.io'],
   },
   {
     name: 'SlickEdit',
@@ -307,7 +341,7 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['win', 'vs.exe']],
     displayNamePrefix: 'SlickEdit',
-    publisher: 'SlickEdit Inc.',
+    publishers: ['SlickEdit Inc.'],
   },
   {
     name: 'Aptana Studio 3',
@@ -316,23 +350,23 @@ const editors: WindowsExternalEditor[] = [
     ],
     executableShimPaths: [['AptanaStudio3.exe']],
     displayNamePrefix: 'Aptana Studio',
-    publisher: 'Appcelerator',
+    publishers: ['Appcelerator'],
   },
   {
     name: 'JetBrains Webstorm',
     registryKeys: registryKeysForJetBrainsIDE('WebStorm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('webstorm'),
     jetBrainsToolboxScriptName: 'webstorm',
     displayNamePrefix: 'WebStorm',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains Phpstorm',
     registryKeys: registryKeysForJetBrainsIDE('PhpStorm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('phpstorm'),
     jetBrainsToolboxScriptName: 'phpstorm',
     displayNamePrefix: 'PhpStorm',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'Android Studio',
@@ -344,7 +378,7 @@ const editors: WindowsExternalEditor[] = [
       ['..', 'bin', `studio.exe`],
     ],
     displayNamePrefix: 'Android Studio',
-    publisher: 'Google LLC',
+    publishers: ['Google LLC'],
   },
   {
     name: 'Notepad++',
@@ -356,30 +390,30 @@ const editors: WindowsExternalEditor[] = [
     ],
     installLocationRegistryKey: 'DisplayIcon',
     displayNamePrefix: 'Notepad++',
-    publisher: 'Notepad++ Team',
+    publishers: ['Notepad++ Team'],
   },
   {
     name: 'JetBrains Rider',
     registryKeys: registryKeysForJetBrainsIDE('JetBrains Rider'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('rider'),
     jetBrainsToolboxScriptName: 'rider',
     displayNamePrefix: 'JetBrains Rider',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'RStudio',
     registryKeys: [Wow64LocalMachineUninstallKey('RStudio')],
     installLocationRegistryKey: 'DisplayIcon',
     displayNamePrefix: 'RStudio',
-    publisher: 'RStudio',
+    publishers: ['RStudio', 'Posit Software'],
   },
   {
     name: 'JetBrains IntelliJ Idea',
     registryKeys: registryKeysForJetBrainsIDE('IntelliJ IDEA'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('idea'),
     jetBrainsToolboxScriptName: 'idea',
     displayNamePrefix: 'IntelliJ IDEA ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains IntelliJ Idea Community Edition',
@@ -388,54 +422,54 @@ const editors: WindowsExternalEditor[] = [
     ),
     executableShimPaths: executableShimPathsForJetBrainsIDE('idea'),
     displayNamePrefix: 'IntelliJ IDEA Community Edition ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains PyCharm',
     registryKeys: registryKeysForJetBrainsIDE('PyCharm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('pycharm'),
     jetBrainsToolboxScriptName: 'pycharm',
     displayNamePrefix: 'PyCharm ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains PyCharm Community Edition',
     registryKeys: registryKeysForJetBrainsIDE('PyCharm Community Edition'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('pycharm'),
     displayNamePrefix: 'PyCharm Community Edition',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains CLion',
     registryKeys: registryKeysForJetBrainsIDE('CLion'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('clion'),
     jetBrainsToolboxScriptName: 'clion',
     displayNamePrefix: 'CLion ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains RubyMine',
     registryKeys: registryKeysForJetBrainsIDE('RubyMine'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('rubymine'),
     jetBrainsToolboxScriptName: 'rubymine',
     displayNamePrefix: 'RubyMine ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains GoLand',
     registryKeys: registryKeysForJetBrainsIDE('GoLand'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('goland'),
     jetBrainsToolboxScriptName: 'goland',
     displayNamePrefix: 'GoLand ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains Fleet',
     registryKeys: [LocalMachineUninstallKey('Fleet')],
     jetBrainsToolboxScriptName: 'fleet',
     installLocationRegistryKey: 'DisplayIcon',
     displayNamePrefix: 'Fleet ',
-    publisher: 'JetBrains s.r.o.',
+    publishers: ['JetBrains s.r.o.'],
   },
 ]
 
@@ -471,7 +505,7 @@ async function findApplication(editor: WindowsExternalEditor) {
 
     if (
       !displayName.startsWith(editor.displayNamePrefix) ||
-      publisher !== editor.publisher
+      !editor.publishers.includes(publisher)
     ) {
       log.debug(`Unexpected registry entries for ${editor.name}`)
       continue

app/src/lib/feature-flag.ts

@@ -122,3 +122,8 @@ export function enableStackedPopups(): boolean {
 export function enablePreventClosingWhileUpdating(): boolean {
   return true
 }
+
+/** Should we enable the new push-pull-fetch dropdown? */
+export function enablePushPullFetchDropdown(): boolean {
+  return enableBetaFeatures()
+}