Merge pull request #35130 from github/repo-sync

Repo sync

Author: docs-bot

assets/images/help/desktop/appearance-tab-themes.png

@@ -83,8 +83,8 @@ shortTitle: Configure default editor
 {% mac %}
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-1. In the Preferences window, select **Integrations**.
-   ![Screenshot of the "Preferences" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png)
+1. In the Settings window, select **Integrations**.
+   ![Screenshot of the "Settings" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png)
 1. Under "External Editor", use the dropdown menu to select the editor you want to set as your default.
 1. Click **Save**.
 
@@ -103,10 +103,9 @@ shortTitle: Configure default editor
 ## Configuring a custom editor
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-1. In the Preferences window, select **Integrations**.
-   ![Screenshot of the "Preferences" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png)
+1. In the Settings window, select **Integrations**.
+   ![Screenshot of the "Settings" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png)
 1. Under "External Editor", use the dropdown menu to select **Configure Custom Editor**.
-   ![Screenshot of the "Preferences window. Under "External Editor", the dropdown menu is displayed with "Configure Custom Editor" highlighted in blue and outlined in orange.](/assets/images/help/desktop/configure-custom-editor.png)
 1. Click **Choose** to open the system dialog to navigate to the path of your custom editor.
 1. Under "Arguments", enter any arguments you would like to use after the "%TARGET_PATH%" variable. Reference supporting documentation for your custom editor to ensure you have the arguments set correctly, as invalid arguments can prevent the editor from launching in {% data variables.product.prodname_desktop %}.
 1. Click **Save**.

assets/images/help/desktop/mac-select-git-pane.png

@@ -13,11 +13,11 @@ shortTitle: Configure basic settings
 {% mac %}
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-1. To view or change your settings, toggle between the panes in the "Preferences" window.
+1. To view or change your settings, toggle between the panes in the "Settings" window.
 
-   ![Screenshot of the "Preferences" window. The left sidebar, with menu options such as "Accounts" and "Integrations", is highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png)
+   ![Screenshot of the "Settings" window. The left sidebar contains menu options such as "Accounts" and "Integrations".](/assets/images/help/desktop/sign-in-github.png)
 
-   {% data reusables.desktop.preferences-options-tabs %}
+   {% data reusables.desktop.settings-options-tabs %}
 
 {% endmac %}
 
@@ -28,7 +28,7 @@ shortTitle: Configure basic settings
 
    ![Screenshot of the "Options" window. The left sidebar, with menu options such as "Accounts" and "Integrations", is highlighted with an orange outline.](/assets/images/help/desktop/window-select-options-pane.png)
 
-   {% data reusables.desktop.preferences-options-tabs %}
+   {% data reusables.desktop.settings-options-tabs %}
 
 {% endwindows %}
 

assets/images/help/desktop/mac-select-integrations-pane.png

@@ -32,7 +32,7 @@ Configuring your global author information in {% data variables.product.prodname
 {% mac %}
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-{% data reusables.desktop.preferences-git-pane %}
+{% data reusables.desktop.settings-git-pane %}
 {% data reusables.desktop.name-field-git-config %}
 {% data reusables.desktop.select-email-git-config %}
 {% data reusables.desktop.click-save-git-config %}
@@ -89,8 +89,8 @@ You can configure the default branch that will be used when you create a new rep
 {% mac %}
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-{% data reusables.desktop.preferences-git-pane %}
-1. Under "Default branch name for new repositories", select the default branch name you would like to use, or, to enter a custom name, select "Other...".
+{% data reusables.desktop.settings-git-pane %}
+1. Optional, under "Default branch name for new repositories" edit the name of the default branch as needed.
 {% data reusables.desktop.click-save-git-config %}
 
 {% endmac %}

content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md

@@ -37,7 +37,9 @@ To change how you view diffs, in the top-right corner of the diff view, click {%
 * To change how the entire diff is displayed, under "Diff display", select  **Unified** or **Split**. The Unified view shows changes linearly, while the Split view shows old content on the left side and new content on the right side.
 * To hide whitespace changes so you can focus on more substantive changes, select **Hide Whitespace Changes**.
 
-![Screenshot of the diff view of a "README" file. A gear icon is outlined in orange above an expanded dropdown displaying "Whitespace" and "Diff display" settings.](/assets/images/help/desktop/diff-selection.png)
+![Screenshot of the diff view of a file. A gear icon is outlined in orange and expanded to display "Whitespace" and "Diff display" settings.](/assets/images/help/desktop/diff-selection.png)
+
+{% data reusables.desktop.diff-tab-size-tip %}
 
 If you need to see more of the file than {% data variables.product.prodname_desktop %} shows by default, you can expand the diff.
 * To see the next few lines above or below the highlighted changes, click the arrow above or below the line numbers.
@@ -66,7 +68,7 @@ If one file contains multiple changes, but you only want some of those changes t
 
 To exclude changed lines from your commit, click one or more changed lines so the blue disappears. The lines that are still highlighted in blue will be included in the commit.
 
-![Screenshot of the diff view of a text file. Next to the text "I don't want to include this line", the background color behind the line numbers is green, not blue.](/assets/images/help/desktop/partial-commit.png)
+![Screenshot of the diff view of a file. The background color for the line number of "I don't want to include this line" is green, not blue.](/assets/images/help/desktop/partial-commit.png)
 
 ## Discarding changes
 
@@ -115,7 +117,7 @@ Once you're satisfied with the changes you've chosen to include in your commit,
    ![Screenshot of the "Changes" tab in the sidebar. To the right of a profile picture, a text field containing a commit message is outlined in orange.](/assets/images/help/desktop/commit-message.png)
 1. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.
 
-   ![Screenshot of the "Changes" tab. In the corner of the "Description" field, a "person with a plus sign" icon for adding a co-author is outlined in orange.](/assets/images/help/desktop/add-co-author-commit.png)
+   ![Screenshot of the "Changes" tab. In the corner of the "Description" field, the icon for adding a co-author is outlined in orange.](/assets/images/help/desktop/add-co-author-commit.png)
 {% data reusables.desktop.commit-button %}
 1. If the branch you're trying to commit to is protected, Desktop will warn you.
     * To move your changes, click **switch branches**.

content/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop.md

@@ -55,17 +55,17 @@ After you install {% data variables.product.prodname_desktop %}, you can configu
 
 {% mac %}
 
-You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Preferences window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
+You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Settings window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
 
-![Screenshot of the "Preferences" window. Options in the left sidebar are highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png)
+![Screenshot of the "Settings" window. The first option in the left sidebar is selected and shown as blue.](/assets/images/help/desktop/sign-in-github.png)
 
 {% endmac %}
 
 {% windows %}
 
 You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Options window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
 
-![Screenshot of the "Preferences" window. Options in the left sidebar are highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png)
+![Screenshot of the "Options" window. The first option in the left sidebar is selected and shown as blue.](/assets/images/help/desktop/windows-sign-in-github.png)
 
 {% endwindows %}
 

content/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md

@@ -19,7 +19,7 @@ GitHub Desktop keyboard shortcuts on macOS
 
 | Keyboard shortcut | Description
 |-----------|------------
-|<kbd>Command</kbd>+<kbd>,</kbd> | Go to Preferences
+|<kbd>Command</kbd>+<kbd>,</kbd> | Display the Settings window
 |<kbd>Command</kbd>+<kbd>H</kbd> | Hide the {% data variables.product.prodname_desktop %} application
 |<kbd>Option</kbd>+<kbd>Command</kbd>+<kbd>H</kbd> | Hide all other applications
 |<kbd>Command</kbd>+<kbd>Q</kbd> | Quit {% data variables.product.prodname_desktop %}
@@ -80,7 +80,7 @@ GitHub Desktop keyboard shortcuts on Windows
 
 | Keyboard shortcut | Description
 |-----------|------------
-|<kbd>Ctrl</kbd>+<kbd>,</kbd> | Go to Options
+|<kbd>Ctrl</kbd>+<kbd>,</kbd> | Display the Options window
 |<kbd>F11</kbd> | Toggle full screen view
 |<kbd>Ctrl</kbd>+<kbd>0</kbd> | Reset zoom to default text size
 |<kbd>Ctrl</kbd>+<kbd>=</kbd> | Zoom in for larger text and graphics

content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md

@@ -35,7 +35,7 @@ If system notifications are disabled for {% data variables.product.prodname_desk
 {% mac %}
 
 {% data reusables.desktop.mac-select-desktop-menu %}
-1. In the "Preferences" window, on the "Notifications" pane, select **Enable notifications**.
+1. In the "Settings" window, on the "Notifications" pane, select **Enable notifications**.
 1. In the "Enable notifications" description field, click the **Notification Settings** link to open the "Notifications" pane in the macOS "System Settings" window.
 1. In the "Application Notifications" list, select **{% data variables.product.prodname_desktop %}**.
 1. Click **Allow Notifications**.

content/desktop/overview/getting-started-with-github-desktop.md

@@ -2,7 +2,7 @@
 
    {% mac %}
 
-   ![Screenshot of the "Preferences" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes.png)
+   ![Screenshot of the "Settings" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes.png)
 
    {% endmac %}
 

content/desktop/overview/github-desktop-keyboard-shortcuts.md

@@ -0,0 +1,11 @@
+{% mac %}
+
+> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Settings** dialog.
+
+{% endmac %}
+
+{% windows %}
+
+> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Options** dialog.
+
+{% endwindows %}

content/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md

@@ -1,3 +1,3 @@
-1. In the "Preferences" window, click **Git**.
+1. In the "Settings" window, click **Git**.
 
    ![Screenshot of the "Git" pane in the "Preferences" window. In the left sidebar, an option labelled "Git" is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-git-pane.png)