Skip to content

Commit

Permalink
Updated tooltip for ShowDiffForAllParents (#9789)
Browse files Browse the repository at this point in the history
Description for FileHistory open in Browse
  • Loading branch information
gerhardol committed Jan 7, 2022
1 parent deafec8 commit 487f5f1
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions GitUI/TranslatedStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,13 @@ internal sealed class TranslatedStrings : Translate
- For a single selected commit, show the difference with its parent commit.
- For a single selected merge commit, show the difference with all parents.
- For two selected commits with a common ancestor (BASE):
- Show the difference between the commits.
- The difference of unique files from BASE to each of the selected commits.
- The difference of common files (identical changes) from BASE to the commits.
- For multiple selected commits (up to four), show the difference for all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to the last selected commit.");
- For two selected commits with a common ancestor (BASE), show the difference
between the commits as well as the difference from BASE to the selected commits.
See documentation for more details about icons and range diffs.
- For multiple selected commits (up to four), show the difference for
all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to
the last selected commit.");

private readonly TranslationString _stageSelectedLines = new("Stage selected line(s)");
private readonly TranslationString _unstageSelectedLines = new("Unstage selected line(s)");
Expand Down
28 changes: 15 additions & 13 deletions GitUI/Translation/English.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1723,12 +1723,13 @@ The primary difftool can still be selected by clicking the main menu entry.</sou

- For a single selected commit, show the difference with its parent commit.
- For a single selected merge commit, show the difference with all parents.
- For two selected commits with a common ancestor (BASE):
- Show the difference between the commits.
- The difference of unique files from BASE to each of the selected commits.
- The difference of common files (identical changes) from BASE to the commits.
- For multiple selected commits (up to four), show the difference for all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to the last selected commit.</source>
- For two selected commits with a common ancestor (BASE), show the difference
between the commits as well as the difference from BASE to the selected commits.
See documentation for more details about icons and range diffs.
- For multiple selected commits (up to four), show the difference for
all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to
the last selected commit.</source>
<target />
</trans-unit>
<trans-unit id="label1.Text">
Expand Down Expand Up @@ -3291,7 +3292,7 @@ Do you want to continue?</source>
<target />
</trans-unit>
<trans-unit id="chkUseBrowseForFileHistory.Text">
<source>Use Browse For FileHistory</source>
<source>Show file history in the main window</source>
<target />
</trans-unit>
<trans-unit id="gbGeneral.Text">
Expand Down Expand Up @@ -10839,12 +10840,13 @@ Remote: {1}</source>

- For a single selected commit, show the difference with its parent commit.
- For a single selected merge commit, show the difference with all parents.
- For two selected commits with a common ancestor (BASE):
- Show the difference between the commits.
- The difference of unique files from BASE to each of the selected commits.
- The difference of common files (identical changes) from BASE to the commits.
- For multiple selected commits (up to four), show the difference for all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to the last selected commit.</source>
- For two selected commits with a common ancestor (BASE), show the difference
between the commits as well as the difference from BASE to the selected commits.
See documentation for more details about icons and range diffs.
- For multiple selected commits (up to four), show the difference for
all the first selected with the last selected commit.
- For more than four selected commits, show the difference from the first to
the last selected commit.</source>
<target />
</trans-unit>
<trans-unit id="_since.Text">
Expand Down

0 comments on commit 487f5f1

Please sign in to comment.