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

Commit 41ca8a2

Browse files
grokysgrokys
authored
Merge branch 'master' into xml-doc-comments
2 parents 397e916 + 698f7b6 commit 41ca8a2

File tree

69 files changed

+4933
-1276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4933
-1276
lines changed

‎scripts/modules.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ New-Module -ScriptBlock {
104104
}
105105
elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe") {
106106
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
107+
}
108+
elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe") {
109+
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe"
107110
}
108111
else {
109112
Die("No suitable msbuild.exe found.")

‎src/GitHub.App/GitHub.App.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -415,11 +415,17 @@
415415
</ProjectReference>
416416
</ItemGroup>
417417
<ItemGroup>
418+
<EmbeddedResource Include="Resources.en-US.resx">
419+
<DependentUpon>Resources.resx</DependentUpon>
420+
</EmbeddedResource>
418421
<EmbeddedResource Include="Resources.resx">
419422
<Generator>PublicResXFileCodeGenerator</Generator>
420423
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
421424
<SubType>Designer</SubType>
422425
</EmbeddedResource>
426+
<EmbeddedResource Include="Resources.zh-Hans.resx">
427+
<DependentUpon>Resources.resx</DependentUpon>
428+
</EmbeddedResource>
423429
</ItemGroup>
424430
<ItemGroup>
425431
<Analyzer Include="..\..\packages\SerilogAnalyzer.0.12.0.0\analyzers\dotnet\cs\SerilogAnalyzer.dll" />

‎src/GitHub.App/Resources.Designer.cs

+82-82
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/GitHub.App/Resources.en-US.resx

+330
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,330 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="BrowseForDirectory" xml:space="preserve">
121+
<value>Select a containing folder for your new repository.</value>
122+
</data>
123+
<data name="CloneTitle" xml:space="preserve">
124+
<value>Clone a {0} Repository</value>
125+
</data>
126+
<data name="CouldNotConnectToGitHub" xml:space="preserve">
127+
<value>Could not connect to github.com</value>
128+
</data>
129+
<data name="CreateGistTitle" xml:space="preserve">
130+
<value>Create a GitHub Gist</value>
131+
</data>
132+
<data name="CreateTitle" xml:space="preserve">
133+
<value>Create a {0} Repository</value>
134+
</data>
135+
<data name="DefaultGistFileName" xml:space="preserve">
136+
<value>GistFromVisualStudio.cs</value>
137+
</data>
138+
<data name="EnterpriseUrlValidatorEmpty" xml:space="preserve">
139+
<value>Please enter an Enterprise URL</value>
140+
</data>
141+
<data name="EnterpriseUrlValidatorInvalid" xml:space="preserve">
142+
<value>Please enter a valid Enterprise URL</value>
143+
</data>
144+
<data name="EnterpriseUrlValidatorNotAGitHubHost" xml:space="preserve">
145+
<value>Not an Enterprise server. Please enter an Enterprise URL</value>
146+
</data>
147+
<data name="ForgotPasswordLink" xml:space="preserve">
148+
<value>(forgot your password?)</value>
149+
</data>
150+
<data name="LoginFailedForbiddenMessage" xml:space="preserve">
151+
<value>Make sure to use your password and not a Personal Access token to sign in.</value>
152+
</data>
153+
<data name="LoginFailedMessage" xml:space="preserve">
154+
<value>Check your username and password, then try again</value>
155+
</data>
156+
<data name="LoginFailedText" xml:space="preserve">
157+
<value>Sign in failed.</value>
158+
</data>
159+
<data name="LoginTitle" xml:space="preserve">
160+
<value>Connect To GitHub</value>
161+
</data>
162+
<data name="PasswordValidatorEmpty" xml:space="preserve">
163+
<value>Please enter your password</value>
164+
</data>
165+
<data name="PRCreatedUpstream" xml:space="preserve">
166+
<value>Pull Request for branch **{0}** created successfully at [{1}]({2})</value>
167+
</data>
168+
<data name="PublishTitle" xml:space="preserve">
169+
<value>Publish repository</value>
170+
</data>
171+
<data name="PublishToTitle" xml:space="preserve">
172+
<value>Publish repository to {0}</value>
173+
</data>
174+
<data name="PullRequestCreationTitleValidatorEmpty" xml:space="preserve">
175+
<value>Please enter a title for the Pull Request</value>
176+
</data>
177+
<data name="PullRequestSourceAndTargetBranchTheSame" xml:space="preserve">
178+
<value>Source and target branch cannot be the same</value>
179+
</data>
180+
<data name="PullRequestSourceBranchDoesNotExist" xml:space="preserve">
181+
<value>Source branch doesn't exist remotely, have you pushed it?</value>
182+
</data>
183+
<data name="RepositoryCloneFailedNoSelectedRepo" xml:space="preserve">
184+
<value>No selected repository.</value>
185+
</data>
186+
<data name="RepositoryCreationClonePathEmpty" xml:space="preserve">
187+
<value>Please enter a repository path</value>
188+
</data>
189+
<data name="RepositoryCreationClonePathInvalid" xml:space="preserve">
190+
<value>Please enter a valid path</value>
191+
</data>
192+
<data name="RepositoryCreationClonePathInvalidCharacters" xml:space="preserve">
193+
<value>Path contains invalid characters</value>
194+
</data>
195+
<data name="RepositoryCreationClonePathTooLong" xml:space="preserve">
196+
<value>Path too long</value>
197+
</data>
198+
<data name="RepositoryCreationFailedAlreadyExists" xml:space="preserve">
199+
<value>Repository '{0}/{1}' already exists.</value>
200+
</data>
201+
<data name="RepositoryCreationFailedAlreadyExistsMessage" xml:space="preserve">
202+
<value>Change the repository name or select a different account and try again.</value>
203+
</data>
204+
<data name="RepositoryCreationFailedQuota" xml:space="preserve">
205+
<value>Exceeded private repositories quota.</value>
206+
</data>
207+
<data name="RepositoryNameValidatorAlreadyExists" xml:space="preserve">
208+
<value>Repository with same name already exists at this location</value>
209+
</data>
210+
<data name="RepositoryNameValidatorEmpty" xml:space="preserve">
211+
<value>Please enter a repository name</value>
212+
</data>
213+
<data name="RepositoryNameValidatorTooLong" xml:space="preserve">
214+
<value>Repository name must be fewer than 100 characters</value>
215+
</data>
216+
<data name="SafeRepositoryNameWarning" xml:space="preserve">
217+
<value>Will be created as {0}</value>
218+
</data>
219+
<data name="TwoFactorApp" xml:space="preserve">
220+
<value>Open the two-factor authentication app on your device to view your authentication code.</value>
221+
</data>
222+
<data name="TwoFactorSms" xml:space="preserve">
223+
<value>We sent you a message via SMS with your authentication code.</value>
224+
</data>
225+
<data name="TwoFactorTitle" xml:space="preserve">
226+
<value>Two-Factor authentication required</value>
227+
</data>
228+
<data name="TwoFactorUnknown" xml:space="preserve">
229+
<value>Enter a sign in authentication code here</value>
230+
</data>
231+
<data name="UsernameOrEmailValidatorEmpty" xml:space="preserve">
232+
<value>Please enter your username or email address</value>
233+
</data>
234+
<data name="UsernameOrEmailValidatorSpaces" xml:space="preserve">
235+
<value>Username or email address must not have spaces</value>
236+
</data>
237+
<data name="PullRequestsNavigationItemText" xml:space="preserve">
238+
<value>Pull Requests</value>
239+
</data>
240+
<data name="PullRequestNavigationItemText" xml:space="preserve">
241+
<value>Pull Request</value>
242+
</data>
243+
<data name="AddedFileStatus" xml:space="preserve">
244+
<value>add</value>
245+
</data>
246+
<data name="Fork" xml:space="preserve">
247+
<value>fork</value>
248+
</data>
249+
<data name="InvalidBranchName" xml:space="preserve">
250+
<value>[invalid]</value>
251+
</data>
252+
<data name="MustPullBeforePush" xml:space="preserve">
253+
<value>You must pull before you can push</value>
254+
</data>
255+
<data name="NoCommitsToPull" xml:space="preserve">
256+
<value>No commits to pull</value>
257+
</data>
258+
<data name="NoCommitsToPush" xml:space="preserve">
259+
<value>No commits to push</value>
260+
</data>
261+
<data name="NoDescriptionProvidedMarkdown" xml:space="preserve">
262+
<value>*No description provided.*</value>
263+
</data>
264+
<data name="PullRequestDetailsCheckout" xml:space="preserve">
265+
<value>Checkout {0}</value>
266+
</data>
267+
<data name="PullRequestDetailsCheckoutTo" xml:space="preserve">
268+
<value>Checkout to {0}</value>
269+
</data>
270+
<data name="PullRequestDetailsPullToolTip" xml:space="preserve">
271+
<value>Pull from {0} branch {1}</value>
272+
</data>
273+
<data name="PullRequestDetailsPushToolTip" xml:space="preserve">
274+
<value>Push to {0} branch {1}</value>
275+
</data>
276+
<data name="Remote" xml:space="preserve">
277+
<value>remote</value>
278+
</data>
279+
<data name="RenamedFileStatus" xml:space="preserve">
280+
<value>rename</value>
281+
</data>
282+
<data name="SourceRepositoryNoLongerAvailable" xml:space="preserve">
283+
<value>The source repository is no longer available.</value>
284+
</data>
285+
<data name="WorkingDirectoryHasUncommittedCHanges" xml:space="preserve">
286+
<value>Cannot checkout as your working directory has uncommitted changes.</value>
287+
</data>
288+
<data name="SyncSubmodules" xml:space="preserve">
289+
<value>Sync {0} submodules</value>
290+
</data>
291+
<data name="CouldntFindGitOnPath" xml:space="preserve">
292+
<value>Couldn't find Git.exe on PATH.
293+
294+
Please install Git for Windows from:
295+
https://git-scm.com/download/win</value>
296+
</data>
297+
<data name="Approved" xml:space="preserve">
298+
<value>Approved</value>
299+
</data>
300+
<data name="ChangesRequested" xml:space="preserve">
301+
<value>Changes Requested</value>
302+
</data>
303+
<data name="Commented" xml:space="preserve">
304+
<value>Commented</value>
305+
</data>
306+
<data name="InProgress" xml:space="preserve">
307+
<value>InProgress</value>
308+
</data>
309+
<data name="NavigateToEditorStatusMessage" xml:space="preserve">
310+
<value>Press Enter to navigate to Editor</value>
311+
</data>
312+
<data name="NavigateToEditorNotCheckedOutInfoMessage" xml:space="preserve">
313+
<value>Checkout PR branch before navigating to Editor</value>
314+
</data>
315+
<data name="NavigateToEditorNotCheckedOutStatusMessage" xml:space="preserve">
316+
<value>Press Enter to navigate to Editor (PR branch must be checked out)</value>
317+
</data>
318+
<data name="ForkRepositoryTitle" xml:space="preserve">
319+
<value>Fork Repository</value>
320+
</data>
321+
<data name="SwitchOriginTitle" xml:space="preserve">
322+
<value>Switch Origin</value>
323+
</data>
324+
<data name="CancelPendingReviewConfirmation" xml:space="preserve">
325+
<value>Are you sure you want to cancel this review? You will lose all your pending comments.</value>
326+
</data>
327+
<data name="CancelPendingReviewConfirmationCaption" xml:space="preserve">
328+
<value>Cancel Review</value>
329+
</data>
330+
</root>

0 commit comments

Comments
 (0)