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

Commit f854d60

Browse files
shanashana
committed
Localize prompt texts and dedup some resources
1 parent f83e50d commit f854d60

File tree

7 files changed

+137
-359
lines changed

7 files changed

+137
-359
lines changed

‎src/GitHub.VisualStudio.UI/Resources.Designer.cs‎

Lines changed: 15 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/GitHub.VisualStudio.UI/Resources.resx‎

Lines changed: 114 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -144,176 +144,179 @@
144144
<data name="CreateLink" xml:space="preserve">
145145
<value>Create</value>
146146
</data>
147-
<data name="descriptionOptionalText" xml:space="preserve">
147+
<data name="DescriptionOptional" xml:space="preserve">
148148
<value>Description (Optional)</value>
149149
</data>
150-
<data name="descriptionText" xml:space="preserve">
151-
<value>Description</value>
150+
<data name="openInBrowser" xml:space="preserve">
151+
<value>Open in Browser</value>
152152
</data>
153-
<data name="dontHaveAnAccountText" xml:space="preserve">
154-
<value>Don’t have an account? </value>
153+
<data name="CancelLink" xml:space="preserve">
154+
<value>Cancel</value>
155155
</data>
156-
<data name="dontHaveGitHubEnterpriseText" xml:space="preserve">
157-
<value>Don’t have GitHub Enterprise? </value>
156+
<data name="gistCreationFailedMessage" xml:space="preserve">
157+
<value>Failed to create gist</value>
158158
</data>
159-
<data name="dotComConnectionFailedMessageMessage" xml:space="preserve">
160-
<value>Please check your internet connection and try again.</value>
159+
<data name="prOpenedByText" xml:space="preserve">
160+
<value>by</value>
161161
</data>
162-
<data name="ForgotPasswordLink" xml:space="preserve">
163-
<value>(forgot your password?)</value>
162+
<data name="prOpenedText" xml:space="preserve">
163+
<value>opened</value>
164164
</data>
165-
<data name="LoginLink" xml:space="preserve">
166-
<value>Login</value>
165+
<data name="Options_PrivacyTitle" xml:space="preserve">
166+
<value>Privacy</value>
167167
</data>
168-
<data name="LoginFailedMessage" xml:space="preserve">
169-
<value>Check your username and password, then try again</value>
168+
<data name="Options_MetricsLabel" xml:space="preserve">
169+
<value>Help us improve by sending anonymous usage data</value>
170170
</data>
171-
<data name="PasswordPrompt" xml:space="preserve">
172-
<value>Password</value>
171+
<data name="Error_FailedToCopyToClipboard" xml:space="preserve">
172+
<value>Could not copy to the clipboard. Please try again.</value>
173173
</data>
174-
<data name="UserNameOrEmailPromptText" xml:space="preserve">
175-
<value>Username or email</value>
174+
<data name="LinkCopiedToClipboardMessage" xml:space="preserve">
175+
<value>Link copied to clipboard</value>
176176
</data>
177-
<data name="enterpriseConnectingFailedMessage" xml:space="preserve">
178-
<value>The host isn't available or is not a GitHub Enterprise server. Check the address and try again.</value>
177+
<data name="RepositoryPublishedMessage" xml:space="preserve">
178+
<value>Repository created successfully.</value>
179179
</data>
180-
<data name="enterpriseUrlPromptText" xml:space="preserve">
181-
<value>GitHub Enterprise server address</value>
180+
<data name="makePrivateGist" xml:space="preserve">
181+
<value>Private Gist</value>
182182
</data>
183-
<data name="loadingFailedMessageMessage" xml:space="preserve">
184-
<value>An error occurred while loading repositories</value>
183+
<data name="fileNameText" xml:space="preserve">
184+
<value>File Name</value>
185185
</data>
186-
<data name="loadingFailedMessageContent" xml:space="preserve">
187-
<value>Some or all repositories may not have loaded. Close the dialog and try again.</value>
186+
<data name="NotLoggedInMessage" xml:space="preserve">
187+
<value>You are not logged in to {0}, so certain git operations may fail. [Login now]({1})</value>
188188
</data>
189-
<data name="filterTextPromptText" xml:space="preserve">
190-
<value>Search repositories</value>
189+
<data name="WikiNavigationItemText" xml:space="preserve">
190+
<value>Wiki</value>
191191
</data>
192-
<data name="ignoreTemplateListText" xml:space="preserve">
193-
<value>Git ignore</value>
192+
<data name="PulseNavigationItemText" xml:space="preserve">
193+
<value>Pulse</value>
194194
</data>
195-
<data name="learnMoreLink" xml:space="preserve">
196-
<value>Learn more</value>
195+
<data name="PullRequestsNavigationItemText" xml:space="preserve">
196+
<value>Pull Requests</value>
197197
</data>
198-
<data name="licenseListText" xml:space="preserve">
199-
<value>License</value>
198+
<data name="pathText" xml:space="preserve">
199+
<value>Path</value>
200200
</data>
201-
<data name="localPathText" xml:space="preserve">
202-
<value>Local path</value>
201+
<data name="IssuesNavigationItemText" xml:space="preserve">
202+
<value>Issues</value>
203203
</data>
204-
<data name="LoginFailedText" xml:space="preserve">
205-
<value>Login failed.</value>
204+
<data name="GraphsNavigationItemText" xml:space="preserve">
205+
<value>Graphs</value>
206206
</data>
207-
<data name="makePrivateContent" xml:space="preserve">
208-
<value>Private Repository</value>
207+
<data name="GitHubPublishSectionTitle" xml:space="preserve">
208+
<value>Publish to GitHub</value>
209209
</data>
210-
<data name="nameText" xml:space="preserve">
211-
<value>Name</value>
210+
<data name="BlurbText" xml:space="preserve">
211+
<value>Powerful collaboration, code review, and code management for open source and private projects.</value>
212212
</data>
213-
<data name="noRepositoriesMessageText" xml:space="preserve">
214-
<value>No repositories</value>
213+
<data name="GitHubInvitationSectionConnectLabel" xml:space="preserve">
214+
<value>Connect…</value>
215215
</data>
216-
<data name="openTwoFactorAuthAppText" xml:space="preserve">
217-
<value>Open the two-factor authentication app on your device to view your authentication code.</value>
216+
<data name="CloneLink" xml:space="preserve">
217+
<value>Clone</value>
218218
</data>
219-
<data name="orText" xml:space="preserve">
220-
<value>or</value>
219+
<data name="verifyText" xml:space="preserve">
220+
<value>Verify</value>
221221
</data>
222-
<data name="publishText" xml:space="preserve">
223-
<value>Publish</value>
222+
<data name="twoFactorAuthText" xml:space="preserve">
223+
<value>Two-factor authentication</value>
224224
</data>
225-
<data name="RepoDoesNotHaveRemoteText" xml:space="preserve">
226-
<value>This repository does not have a remote. Fill out the form to publish it to GitHub.</value>
225+
<data name="SignUpLink" xml:space="preserve">
226+
<value>Sign up</value>
227227
</data>
228-
<data name="RepoNameText" xml:space="preserve">
229-
<value>Repository Name</value>
228+
<data name="SignOutLink" xml:space="preserve">
229+
<value>Sign out</value>
230+
</data>
231+
<data name="resendCodeButtonToolTip" xml:space="preserve">
232+
<value>Send the code to your registered SMS Device again</value>
230233
</data>
231234
<data name="resendCodeButtonContent" xml:space="preserve">
232235
<value>Resend</value>
233236
</data>
234-
<data name="resendCodeButtonToolTip" xml:space="preserve">
235-
<value>Send the code to your registered SMS Device again</value>
237+
<data name="RepoNameText" xml:space="preserve">
238+
<value>Repository Name</value>
236239
</data>
237-
<data name="SignOutLink" xml:space="preserve">
238-
<value>Sign out</value>
240+
<data name="RepoDoesNotHaveRemoteText" xml:space="preserve">
241+
<value>This repository does not have a remote. Fill out the form to publish it to GitHub.</value>
239242
</data>
240-
<data name="SignUpLink" xml:space="preserve">
241-
<value>Sign up</value>
243+
<data name="publishText" xml:space="preserve">
244+
<value>Publish</value>
242245
</data>
243-
<data name="twoFactorAuthText" xml:space="preserve">
244-
<value>Two-factor authentication</value>
246+
<data name="orText" xml:space="preserve">
247+
<value>or</value>
245248
</data>
246-
<data name="verifyText" xml:space="preserve">
247-
<value>Verify</value>
249+
<data name="openTwoFactorAuthAppText" xml:space="preserve">
250+
<value>Open the two-factor authentication app on your device to view your authentication code.</value>
248251
</data>
249-
<data name="CloneLink" xml:space="preserve">
250-
<value>Clone</value>
252+
<data name="noRepositoriesMessageText" xml:space="preserve">
253+
<value>No repositories</value>
251254
</data>
252-
<data name="GitHubInvitationSectionConnectLabel" xml:space="preserve">
253-
<value>Connect…</value>
255+
<data name="nameText" xml:space="preserve">
256+
<value>Name</value>
254257
</data>
255-
<data name="BlurbText" xml:space="preserve">
256-
<value>Powerful collaboration, code review, and code management for open source and private projects.</value>
258+
<data name="makePrivateContent" xml:space="preserve">
259+
<value>Private Repository</value>
257260
</data>
258-
<data name="GitHubPublishSectionTitle" xml:space="preserve">
259-
<value>Publish to GitHub</value>
261+
<data name="LoginFailedText" xml:space="preserve">
262+
<value>Login failed.</value>
260263
</data>
261-
<data name="GraphsNavigationItemText" xml:space="preserve">
262-
<value>Graphs</value>
264+
<data name="localPathText" xml:space="preserve">
265+
<value>Local path</value>
263266
</data>
264-
<data name="IssuesNavigationItemText" xml:space="preserve">
265-
<value>Issues</value>
267+
<data name="licenseListText" xml:space="preserve">
268+
<value>License</value>
266269
</data>
267-
<data name="pathText" xml:space="preserve">
268-
<value>Path</value>
270+
<data name="learnMoreLink" xml:space="preserve">
271+
<value>Learn more</value>
269272
</data>
270-
<data name="PullRequestsNavigationItemText" xml:space="preserve">
271-
<value>Pull Requests</value>
273+
<data name="ignoreTemplateListText" xml:space="preserve">
274+
<value>Git ignore</value>
272275
</data>
273-
<data name="PulseNavigationItemText" xml:space="preserve">
274-
<value>Pulse</value>
276+
<data name="filterTextPromptText" xml:space="preserve">
277+
<value>Search repositories</value>
275278
</data>
276-
<data name="WikiNavigationItemText" xml:space="preserve">
277-
<value>Wiki</value>
279+
<data name="loadingFailedMessageContent" xml:space="preserve">
280+
<value>Some or all repositories may not have loaded. Close the dialog and try again.</value>
278281
</data>
279-
<data name="NotLoggedInMessage" xml:space="preserve">
280-
<value>You are not logged in to {0}, so certain git operations may fail. [Login now]({1})</value>
282+
<data name="loadingFailedMessageMessage" xml:space="preserve">
283+
<value>An error occurred while loading repositories</value>
281284
</data>
282-
<data name="fileNameText" xml:space="preserve">
283-
<value>File Name</value>
285+
<data name="enterpriseUrlPromptText" xml:space="preserve">
286+
<value>GitHub Enterprise server address</value>
284287
</data>
285-
<data name="makePrivateGist" xml:space="preserve">
286-
<value>Private Gist</value>
288+
<data name="enterpriseConnectingFailedMessage" xml:space="preserve">
289+
<value>The host isn't available or is not a GitHub Enterprise server. Check the address and try again.</value>
287290
</data>
288-
<data name="RepositoryPublishedMessage" xml:space="preserve">
289-
<value>Repository created successfully.</value>
291+
<data name="UserNameOrEmailPromptText" xml:space="preserve">
292+
<value>Username or email</value>
290293
</data>
291-
<data name="LinkCopiedToClipboardMessage" xml:space="preserve">
292-
<value>Link copied to clipboard</value>
294+
<data name="PasswordPrompt" xml:space="preserve">
295+
<value>Password</value>
293296
</data>
294-
<data name="Error_FailedToCopyToClipboard" xml:space="preserve">
295-
<value>Could not copy to the clipboard. Please try again.</value>
297+
<data name="LoginFailedMessage" xml:space="preserve">
298+
<value>Check your username and password, then try again</value>
296299
</data>
297-
<data name="Options_MetricsLabel" xml:space="preserve">
298-
<value>Help us improve by sending anonymous usage data</value>
300+
<data name="LoginLink" xml:space="preserve">
301+
<value>Login</value>
299302
</data>
300-
<data name="Options_PrivacyTitle" xml:space="preserve">
301-
<value>Privacy</value>
303+
<data name="ForgotPasswordLink" xml:space="preserve">
304+
<value>(forgot your password?)</value>
302305
</data>
303-
<data name="prOpenedText" xml:space="preserve">
304-
<value>opened</value>
306+
<data name="dotComConnectionFailedMessageMessage" xml:space="preserve">
307+
<value>Please check your internet connection and try again.</value>
305308
</data>
306-
<data name="prOpenedByText" xml:space="preserve">
307-
<value>by</value>
309+
<data name="dontHaveGitHubEnterpriseText" xml:space="preserve">
310+
<value>Don’t have GitHub Enterprise? </value>
308311
</data>
309-
<data name="gistCreationFailedMessage" xml:space="preserve">
310-
<value>Failed to create gist</value>
312+
<data name="dontHaveAnAccountText" xml:space="preserve">
313+
<value>Don’t have an account? </value>
311314
</data>
312-
<data name="CancelLink" xml:space="preserve">
313-
<value>Cancel</value>
315+
<data name="TitleRequired" xml:space="preserve">
316+
<value>Title (required)</value>
314317
</data>
315-
<data name="openInBrowser" xml:space="preserve">
316-
<value>Open in Browser</value>
318+
<data name="Description" xml:space="preserve">
319+
<value>Description</value>
317320
</data>
318321
<data name="NotAGitHubRepositoryMessage" xml:space="preserve">
319322
<value>Publish this repository to GitHub and get powerful collaboration, code review, and code management for open source and private projects.</value>

‎src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<Label Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=nameTextBox}" Content="{x:Static prop:Resources.fileNameText}"/>
7575
<ui:PromptTextBox x:Name="fileNameTextBox" Grid.Column="1" Grid.Row="0" />
7676

77-
<Label Grid.Column="0" Grid.Row="1" Target="{Binding ElementName=descriptionTextBox}" Content="{x:Static prop:Resources.descriptionText}"/>
77+
<Label Grid.Column="0" Grid.Row="1" Target="{Binding ElementName=descriptionTextBox}" Content="{x:Static prop:Resources.Description}"/>
7878
<ui:PromptTextBox x:Name="descriptionTextBox" Grid.Column="1" Grid.Row="1"/>
7979

8080
<StackPanel x:Name="accountStackPanel" Grid.Column="1" Grid.Row="2" Orientation="Horizontal">

‎src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
<Label Grid.Row="2"
128128
Grid.Column="0"
129-
Content="{x:Static prop:Resources.descriptionText}"
129+
Content="{x:Static prop:Resources.Description}"
130130
Target="{Binding ElementName=description}" />
131131
<ui:PromptTextBox x:Name="description"
132132
Grid.Row="2"

‎src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<TextBlock Margin="7,12,0,0"
123123
Foreground="{DynamicResource GitHubVsGrayText}"
124124
IsHitTestVisible="False"
125-
Text="{x:Static prop:Resources.descriptionOptionalText}"
125+
Text="{x:Static prop:Resources.DescriptionOptional}"
126126
Visibility="{Binding ElementName=description, Path=Text.Length, Converter={ui:CountToVisibilityConverter}}" />
127127
</Grid>
128128

0 commit comments

Comments
 (0)