Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit bde304e

Browse files
authored
Merge branch 'master' into fixes/1624-hide-diff-view-side-when-empty
2 parents 5a1c9f5 + f09510e commit bde304e

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

src/GitHub.InlineReviews/InlineReviewsPackage.vsct

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<Strings>
5050
<CommandName>GitHub.InlineReviews.NextInlineComment</CommandName>
5151
<ButtonText>Next Comment</ButtonText>
52+
<CanonicalName>.GitHub.NextComment</CanonicalName>
53+
<LocCanonicalName>.GitHub.NextComment</LocCanonicalName>
5254
</Strings>
5355
</Button>
5456
<Button guid="guidGitHubCommandSet" id="PreviousInlineCommentId" priority="0x0100" type="Button">
@@ -58,6 +60,8 @@
5860
<Strings>
5961
<CommandName>GitHub.InlineReviews.PreviousInlineComment</CommandName>
6062
<ButtonText>Previous Comment</ButtonText>
63+
<CanonicalName>.GitHub.PreviousComment</CanonicalName>
64+
<LocCanonicalName>.GitHub.PreviousComment</LocCanonicalName>
6165
</Strings>
6266
</Button>
6367
</Buttons>

src/GitHub.VisualStudio/GitHub.VisualStudio.vsct

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
<CommandFlag>IconIsMoniker</CommandFlag>
7878
<Strings>
7979
<ButtonText>&amp;Connect to GitHub</ButtonText>
80+
<CanonicalName>.GitHub.ConnectToGitHub</CanonicalName>
81+
<LocCanonicalName>.GitHub.ConnectToGitHub</LocCanonicalName>
8082
</Strings>
8183
</Button>
8284

@@ -85,6 +87,8 @@
8587
<CommandFlag>IconIsMoniker</CommandFlag>
8688
<Strings>
8789
<ButtonText>GitHub</ButtonText>
90+
<CanonicalName>.GitHub.ShowGitHubPane</CanonicalName>
91+
<LocCanonicalName>.GitHub.ShowGitHubPane</LocCanonicalName>
8892
</Strings>
8993
</Button>
9094

@@ -93,8 +97,8 @@
9397
<CommandFlag>IconIsMoniker</CommandFlag>
9498
<Strings>
9599
<ButtonText>Show Current Pull Request</ButtonText>
96-
<CanonicalName>GitHub.ShowCurrentPullRequest</CanonicalName>
97-
<LocCanonicalName>GitHub.ShowCurrentPullRequest</LocCanonicalName>
100+
<CanonicalName>.GitHub.ShowCurrentPullRequest</CanonicalName>
101+
<LocCanonicalName>.GitHub.ShowCurrentPullRequest</LocCanonicalName>
98102
</Strings>
99103
</Button>
100104

@@ -105,6 +109,8 @@
105109
<CommandFlag>DefaultDisabled</CommandFlag>
106110
<Strings>
107111
<ButtonText>Back</ButtonText>
112+
<CanonicalName>.GitHub.Back</CanonicalName>
113+
<LocCanonicalName>.GitHub.Back</LocCanonicalName>
108114
</Strings>
109115
</Button>
110116

@@ -114,6 +120,8 @@
114120
<CommandFlag>DefaultDisabled</CommandFlag>
115121
<Strings>
116122
<ButtonText>Forward</ButtonText>
123+
<CanonicalName>.GitHub.Forward</CanonicalName>
124+
<LocCanonicalName>.GitHub.Forward</LocCanonicalName>
117125
</Strings>
118126
</Button>
119127

@@ -123,6 +131,8 @@
123131
<CommandFlag>DefaultDisabled</CommandFlag>
124132
<Strings>
125133
<ButtonText>Pull Requests</ButtonText>
134+
<CanonicalName>.GitHub.PullRequests</CanonicalName>
135+
<LocCanonicalName>.GitHub.PullRequests</LocCanonicalName>
126136
</Strings>
127137
</Button>
128138

@@ -132,6 +142,8 @@
132142
<CommandFlag>DefaultDisabled</CommandFlag>
133143
<Strings>
134144
<ButtonText>Refresh</ButtonText>
145+
<CanonicalName>.GitHub.Refresh</CanonicalName>
146+
<LocCanonicalName>.GitHub.Refresh</LocCanonicalName>
135147
</Strings>
136148
</Button>
137149

@@ -141,6 +153,8 @@
141153
<CommandFlag>DefaultDisabled</CommandFlag>
142154
<Strings>
143155
<ButtonText>View on GitHub</ButtonText>
156+
<CanonicalName>.GitHub.ViewOnGitHub</CanonicalName>
157+
<LocCanonicalName>.GitHub.ViewOnGitHub</LocCanonicalName>
144158
</Strings>
145159
</Button>
146160

@@ -149,6 +163,8 @@
149163
<CommandFlag>IconIsMoniker</CommandFlag>
150164
<Strings>
151165
<ButtonText>Help</ButtonText>
166+
<CanonicalName>.GitHub.Help</CanonicalName>
167+
<LocCanonicalName>.GitHub.Help</LocCanonicalName>
152168
</Strings>
153169
</Button>
154170

@@ -159,6 +175,8 @@
159175
<CommandFlag>DynamicVisibility</CommandFlag>
160176
<Strings>
161177
<ButtonText>Create a GitHub Gist</ButtonText>
178+
<CanonicalName>.GitHub.CreateGist</CanonicalName>
179+
<LocCanonicalName>.GitHub.CreateGist</LocCanonicalName>
162180
</Strings>
163181
</Button>
164182

@@ -169,6 +187,8 @@
169187
<CommandFlag>DynamicVisibility</CommandFlag>
170188
<Strings>
171189
<ButtonText>Open on GitHub</ButtonText>
190+
<CanonicalName>.GitHub.OpenLink</CanonicalName>
191+
<LocCanonicalName>.GitHub.OpenLink</LocCanonicalName>
172192
</Strings>
173193
</Button>
174194

@@ -179,6 +199,8 @@
179199
<CommandFlag>DynamicVisibility</CommandFlag>
180200
<Strings>
181201
<ButtonText>Copy link to clipboard</ButtonText>
202+
<CanonicalName>.GitHub.CopyLink</CanonicalName>
203+
<LocCanonicalName>.GitHub.CopyLink</LocCanonicalName>
182204
</Strings>
183205
</Button>
184206

@@ -189,16 +211,20 @@
189211
<CommandFlag>DynamicVisibility</CommandFlag>
190212
<Strings>
191213
<ButtonText>Blame</ButtonText>
214+
<CanonicalName>.GitHub.Blame</CanonicalName>
215+
<LocCanonicalName>.GitHub.Blame</LocCanonicalName>
192216
</Strings>
193217
</Button>
194-
218+
195219
<Button guid="guidContextMenuSet" id="openFileInSolutionCommand" type="Button">
196220
<Icon guid="guidImages" id="logo" />
197221
<CommandFlag>IconIsMoniker</CommandFlag>
198222
<CommandFlag>DefaultInvisible</CommandFlag>
199223
<CommandFlag>DynamicVisibility</CommandFlag>
200224
<Strings>
201225
<ButtonText>Open File in Solution</ButtonText>
226+
<CanonicalName>.GitHub.OpenFileInSolution</CanonicalName>
227+
<LocCanonicalName>.GitHub.OpenFileInSolution</LocCanonicalName>
202228
</Strings>
203229
</Button>
204230

0 commit comments

Comments
 (0)