diff --git a/README.md b/README.md index 9eedee0630..e926f19fbf 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Most of the extension UI lives in the Team Explorer pane, which is available fro Official builds of this extension are available at [the official website](https://visualstudio.github.com). - [![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master) +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio) [![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio) [![Join the chat at freenode:github-vs](https://img.shields.io/badge/irc-freenode:%20%23github--vs-blue.svg)](http://webchat.freenode.net/?channels=%23github-vs) [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 0000000000..b64b1efeaa --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /src/**/Resources.resx + translation: /%original_path%/Resources.%locale%.resx \ No newline at end of file diff --git a/scripts/modules.ps1 b/scripts/modules.ps1 index cd61409ce1..a5e0b78d9a 100644 --- a/scripts/modules.ps1 +++ b/scripts/modules.ps1 @@ -105,6 +105,9 @@ New-Module -ScriptBlock { elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe") { $msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" } + elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe") { + $msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" + } else { Die("No suitable msbuild.exe found.") } diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index 3f60d278c6..d5607f496d 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -30,7 +30,7 @@ Resources.Designer.cs - + @@ -67,4 +67,4 @@ - + \ No newline at end of file diff --git a/src/GitHub.App/Resources.zh-CN.resx b/src/GitHub.App/Resources.zh-CN.resx new file mode 100644 index 0000000000..3ccf43f8d1 --- /dev/null +++ b/src/GitHub.App/Resources.zh-CN.resx @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 为新版本库选择文件夹。 + + + 克隆一个 {0} 版本库 + + + 无法连接到github.com + + + 创建一个GitHub Gist + + + 创建一个{0}存储库 + + + GistFromVisualStudio.cs + + + 请输入企业网址 + + + 请输入有效的企业网址 + + + 不是企业服务器。请输入企业服务器 URL + + + (是否忘记了您的密码?) + + + 请确保使用您的密码而不是登录的个人访问令牌。 + + + 检查您的用户名和密码然后重试 + + + 登录失败。 + + + 连接到 GitHub + + + 请输入您的密码 + + + 在 [{1}] ({2}) 上成功创建分支 ** {0} ** 拉取请求 + + + 发布版本库 + + + 发布版本库至 {0} + + + 请输入请求的标题! + + + 源和目标分支不能相同 + + + 远程不存在源分支, 你有没有推送它？ + + + 没有选定的存储库。 + + + 请输入名称 + + + 请输入有效路径 + + + 路径包含无效字符 + + + 路径太长 + + + 版本库 '{0}/{1}'已存在。 + + + 请更改存储库名称或选择其他帐户, 然后重试。 + + + 私密文档 + + + 同名的广告活动已存在 + + + 请输入姓名 + + + 这个名字不能超过100个字符 + + + 将要创建为 {0} + + + 在您的手机上安装双重验证程序：Google Authenticator + + + 我们将发送一条验证码短信到您的手机。 + + + 双重身份认证 + + + 在此处输入身份验证代码中的符号 + + + 请输入您的用户名或邮箱地址. + + + 用户名或电子邮件地址不能有空格 + + + 拉取请求 + + + 推送请求 + + + 添加 + + + fork + + + [无效] + + + 你必须先拉取再推送 + + + 没有需要拉取的提交 + + + 没有需要推送的提交 + + + * 未提供说明。* + + + 签出 {0} + + + 签出到 {0} + + + 从 {0} 分支 {1} 拉取 + + + 推至 {0} 分支 {1} + + + 远程 + + + 重命名 + + + 源存版本库不再可用。 + + + 无法签出, 因为您的工作目录有未提交的更改。 + + + 同步 {0} 子模块 + + + 在PATH 找不到 Git.exe。 + +请安装 Git for Windows : https://git-scm.com/download/win + + + 批准 + + + 更改需求 + + + 已评论 + + + 进行中 + + + 按回车键导航到编辑器 + + + 在导航到编辑器之前签出 PR 分支 + + + 按回车键导航到编辑器 (PR 分支必须签出) + + + Fork存储库 + + + 开关原点 + + + 您确定要取消此评审吗？您将丢失所有待处理的评论。 + + + 取消评审 + + diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.InlineReviews/Views/CommentView.xaml index 7e49028622..5deab58196 100644 --- a/src/GitHub.InlineReviews/Views/CommentView.xaml +++ b/src/GitHub.InlineReviews/Views/CommentView.xaml @@ -67,7 +67,7 @@ CornerRadius="3" Padding="2 1" Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}"> - Pending + @@ -216,10 +216,9 @@ - + Content="{x:Static prop:Resources.StartAReview}" + Visibility="{Binding CanStartReview, Converter={ui:BooleanToVisibilityConverter}}"/> + - - View, Checkout or Create a Pull request - + diff --git a/src/GitHub.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index 3ce65912d3..a73e46dd68 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -25,7 +25,7 @@ AutomationIDs.Designer.cs - + diff --git a/src/GitHub.UI/Resources.zh-CN.resx b/src/GitHub.UI/Resources.zh-CN.resx new file mode 100644 index 0000000000..1d2c53e2f9 --- /dev/null +++ b/src/GitHub.UI/Resources.zh-CN.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + {0:N0} 天前 + + + {0:N0} 天前 + + + {0:N0} 小时前 + + + {0:N0} 小时前 + + + {0:N0} 分钟前 + + + {0:N0} 分钟前 + + + {0:N0} 月前 + + + {0:N0} 月前 + + + {0:N0} 秒前 + + + {0:N0} 秒前 + + + {0:N0} 年前 + + + {0:N0} 年前 + + diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index 96356ce104..d81da8d53b 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -23,4 +23,19 @@ + + + + True + True + Resources.resx + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.Designer.cs b/src/GitHub.VisualStudio.UI/Resources.Designer.cs index c497412cab..48d99015c4 100644 --- a/src/GitHub.VisualStudio.UI/Resources.Designer.cs +++ b/src/GitHub.VisualStudio.UI/Resources.Designer.cs @@ -87,6 +87,24 @@ public static string AddYourReview { } } + /// + /// Looks up a localized string similar to Approve. + /// + public static string Approve { + get { + return ResourceManager.GetString("Approve", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Assignee. + /// + public static string Assignee { + get { + return ResourceManager.GetString("Assignee", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invalid authentication code. /// @@ -123,6 +141,24 @@ public static string authenticationSentLabelMessage { } } + /// + /// Looks up a localized string similar to Author. + /// + public static string Author { + get { + return ResourceManager.GetString("Author", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Back. + /// + public static string Back { + get { + return ResourceManager.GetString("Back", resourceCulture); + } + } + /// /// Looks up a localized string similar to The GitHub extension is not available inside Blend. /// @@ -150,6 +186,15 @@ public static string browsePathButtonContent { } } + /// + /// Looks up a localized string similar to Cancel. + /// + public static string Cancel { + get { + return ResourceManager.GetString("Cancel", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cancel. /// @@ -168,6 +213,15 @@ public static string ChangesCountFormat { } } + /// + /// Looks up a localized string similar to This file has changed since the permalink was created. + /// + public static string ChangesInWorkingDirectoryMessage { + get { + return ResourceManager.GetString("ChangesInWorkingDirectoryMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Clone. /// @@ -177,6 +231,24 @@ public static string CloneLink { } } + /// + /// Looks up a localized string similar to Comment only. + /// + public static string CommentOnly { + get { + return ResourceManager.GetString("CommentOnly", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Comments. + /// + public static string Comments { + get { + return ResourceManager.GetString("Comments", resourceCulture); + } + } + /// /// Looks up a localized string similar to Compare File as Default Action. /// @@ -222,6 +294,15 @@ public static string CreateAccountLink { } } + /// + /// Looks up a localized string similar to create a pull request. + /// + public static string CreateAPullRequest { + get { + return ResourceManager.GetString("CreateAPullRequest", resourceCulture); + } + } + /// /// Looks up a localized string similar to Create. /// @@ -231,6 +312,24 @@ public static string CreateLink { } } + /// + /// Looks up a localized string similar to Create New. + /// + public static string CreateNew { + get { + return ResourceManager.GetString("CreateNew", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Create pull request. + /// + public static string CreatePullRequest { + get { + return ResourceManager.GetString("CreatePullRequest", resourceCulture); + } + } + /// /// Looks up a localized string similar to Are you sure you want to delete this comment?. /// @@ -267,6 +366,15 @@ public static string DescriptionOptional { } } + /// + /// Looks up a localized string similar to Please open the repository '{0}' and try again. + /// + public static string DifferentRepositoryMessage { + get { + return ResourceManager.GetString("DifferentRepositoryMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Don’t have an account? . /// @@ -339,6 +447,15 @@ public static string filterBranchesText { } } + /// + /// Looks up a localized string similar to Filter by Author. + /// + public static string FilterByAuthor { + get { + return ResourceManager.GetString("FilterByAuthor", resourceCulture); + } + } + /// /// Looks up a localized string similar to Search repositories. /// @@ -366,6 +483,24 @@ public static string ForkNavigationItemText { } } + /// + /// Looks up a localized string similar to Fork Repository. + /// + public static string ForkRepository { + get { + return ResourceManager.GetString("ForkRepository", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fork the repository. + /// + public static string ForkTheRepository { + get { + return ResourceManager.GetString("ForkTheRepository", resourceCulture); + } + } + /// /// Looks up a localized string similar to Get Started. /// @@ -555,6 +690,33 @@ public static string nameText { } } + /// + /// Looks up a localized string similar to Next Comment. + /// + public static string NextComment { + get { + return ResourceManager.GetString("NextComment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There is no active repository to navigate. + /// + public static string NoActiveRepositoryMessage { + get { + return ResourceManager.GetString("NoActiveRepositoryMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Couldn't a find a GitHub URL in clipboard. + /// + public static string NoGitHubUrlMessage { + get { + return ResourceManager.GetString("NoGitHubUrlMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to No repositories. /// @@ -564,6 +726,33 @@ public static string noRepositoriesMessageText { } } + /// + /// Looks up a localized string similar to The target URL has a different owner to the current repository.. + /// + public static string NoResolveDifferentOwnerMessage { + get { + return ResourceManager.GetString("NoResolveDifferentOwnerMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Couldn't find target URL in current repository. Try again after doing a fetch.. + /// + public static string NoResolveSameOwnerMessage { + get { + return ResourceManager.GetString("NoResolveSameOwnerMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No results matched your search.. + /// + public static string NoResultsMatchedYourSearch { + get { + return ResourceManager.GetString("NoResultsMatchedYourSearch", resourceCulture); + } + } + /// /// Looks up a localized string similar to This repository is not on GitHub. /// @@ -654,6 +843,15 @@ public static string OpenPROnGitHubToolTip { } } + /// + /// Looks up a localized string similar to Open repository at '{0}'?. + /// + public static string OpenRepositoryAtDir { + get { + return ResourceManager.GetString("OpenRepositoryAtDir", resourceCulture); + } + } + /// /// Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code.. /// @@ -744,6 +942,15 @@ public static string orText { } } + /// + /// Looks up a localized string similar to Outdated comments. + /// + public static string OutdatedComments { + get { + return ResourceManager.GetString("OutdatedComments", resourceCulture); + } + } + /// /// Looks up a localized string similar to Password. /// @@ -762,6 +969,24 @@ public static string pathText { } } + /// + /// Looks up a localized string similar to Pending. + /// + public static string Pending { + get { + return ResourceManager.GetString("Pending", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Previous Comment. + /// + public static string PreviousComment { + get { + return ResourceManager.GetString("PreviousComment", resourceCulture); + } + } + /// /// Looks up a localized string similar to by. /// @@ -798,6 +1023,24 @@ public static string PublishToGitHubButton { } } + /// + /// Looks up a localized string similar to Pull. + /// + public static string Pull { + get { + return ResourceManager.GetString("Pull", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pull requests let you tell others about changes you've pushed to a repository on GitHub. + /// + public static string PullRequestsLetYouTellOthersAboutChangesYouVePushedToARepositoryOnGitHub { + get { + return ResourceManager.GetString("PullRequestsLetYouTellOthersAboutChangesYouVePushedToARepositoryOnGitHub", resourceCulture); + } + } + /// /// Looks up a localized string similar to Pull Requests. /// @@ -816,6 +1059,15 @@ public static string PulseNavigationItemText { } } + /// + /// Looks up a localized string similar to Push. + /// + public static string Push { + get { + return ResourceManager.GetString("Push", resourceCulture); + } + } + /// /// Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub.. /// @@ -843,6 +1095,15 @@ public static string RepositoryPublishedMessage { } } + /// + /// Looks up a localized string similar to Request changes. + /// + public static string RequestChanges { + get { + return ResourceManager.GetString("RequestChanges", resourceCulture); + } + } + /// /// Looks up a localized string similar to Resend. /// @@ -879,6 +1140,15 @@ public static string Reviewers { } } + /// + /// Looks up a localized string similar to Select Fork. + /// + public static string SelectFork { + get { + return ResourceManager.GetString("SelectFork", resourceCulture); + } + } + /// /// Looks up a localized string similar to Sign in.... /// @@ -897,6 +1167,24 @@ public static string SignInLink { } } + /// + /// Looks up a localized string similar to Sign in to GitHub. + /// + public static string SignInToGitHub { + get { + return ResourceManager.GetString("SignInToGitHub", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sign in with your browser. + /// + public static string SignInWithYourBrowser { + get { + return ResourceManager.GetString("SignInWithYourBrowser", resourceCulture); + } + } + /// /// Looks up a localized string similar to Sign out. /// @@ -915,6 +1203,24 @@ public static string SignUpLink { } } + /// + /// Looks up a localized string similar to Start a review. + /// + public static string StartAReview { + get { + return ResourceManager.GetString("StartAReview", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Submit your review for. + /// + public static string SubmitYourReviewFor { + get { + return ResourceManager.GetString("SubmitYourReviewFor", resourceCulture); + } + } + /// /// Looks up a localized string similar to Switch to List View. /// @@ -933,6 +1239,15 @@ public static string SwitchToTreeView { } } + /// + /// Looks up a localized string similar to Sync. + /// + public static string Sync { + get { + return ResourceManager.GetString("Sync", resourceCulture); + } + } + /// /// Looks up a localized string similar to Welcome to GitHub for Visual Studio! Why not take a look at our [training](show-training) or [documentation](show-docs)? /// @@ -944,6 +1259,15 @@ public static string TeamExplorerWelcomeMessage { } } + /// + /// Looks up a localized string similar to There aren't any open pull requests. + /// + public static string ThereArenTAnyOpenPullRequests { + get { + return ResourceManager.GetString("ThereArenTAnyOpenPullRequests", resourceCulture); + } + } + /// /// Looks up a localized string similar to Title (required). /// @@ -953,6 +1277,15 @@ public static string TitleRequired { } } + /// + /// Looks up a localized string similar to To get started you can. + /// + public static string ToGetStartedYouCan { + get { + return ResourceManager.GetString("ToGetStartedYouCan", resourceCulture); + } + } + /// /// Looks up a localized string similar to Token. /// @@ -962,6 +1295,15 @@ public static string TokenPrompt { } } + /// + /// Looks up a localized string similar to to point to. + /// + public static string ToPointTo { + get { + return ResourceManager.GetString("ToPointTo", resourceCulture); + } + } + /// /// Looks up a localized string similar to Two-factor authentication. /// @@ -971,6 +1313,15 @@ public static string twoFactorAuthText { } } + /// + /// Looks up a localized string similar to Couldn't open from '{0}'. Only URLs that link to repository files are currently supported.. + /// + public static string UnknownLinkTypeMessage { + get { + return ResourceManager.GetString("UnknownLinkTypeMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Update comment. /// @@ -989,6 +1340,15 @@ public static string UpdatedFormat { } } + /// + /// Looks up a localized string similar to Update your local repository's. + /// + public static string UpdateYourLocalRepositoryS { + get { + return ResourceManager.GetString("UpdateYourLocalRepositoryS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Username or email. /// @@ -1025,6 +1385,15 @@ public static string ViewChangesInSolution { } } + /// + /// Looks up a localized string similar to View, Checkout or Create a Pull request. + /// + public static string ViewCheckoutOrCreateAPullRequest { + get { + return ResourceManager.GetString("ViewCheckoutOrCreateAPullRequest", resourceCulture); + } + } + /// /// Looks up a localized string similar to View File. /// @@ -1042,5 +1411,32 @@ public static string WikiNavigationItemText { return ResourceManager.GetString("WikiNavigationItemText", resourceCulture); } } + + /// + /// Looks up a localized string similar to wrote. + /// + public static string Wrote { + get { + return ResourceManager.GetString("Wrote", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must commit and push your changes to add a comment here.. + /// + public static string YouMustCommitAndPushYourChangesToAddACommentHere { + get { + return ResourceManager.GetString("YouMustCommitAndPushYourChangesToAddACommentHere", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your review summary. + /// + public static string YourReviewSummary { + get { + return ResourceManager.GetString("YourReviewSummary", resourceCulture); + } + } } } diff --git a/src/GitHub.VisualStudio.UI/Resources.resx b/src/GitHub.VisualStudio.UI/Resources.resx index 864d1f0dd1..245009dae2 100644 --- a/src/GitHub.VisualStudio.UI/Resources.resx +++ b/src/GitHub.VisualStudio.UI/Resources.resx @@ -434,9 +434,102 @@ Update comment + + Cancel + + + Pending + + + Start a review + + + You must commit and push your changes to add a comment here. + + + Previous Comment + + + Next Comment + + + View, Checkout or Create a Pull request + + + Back + + + Fork Repository + + + Fork the repository + + + Update your local repository's + + + to point to + + + Create pull request + + + Sign in to GitHub + + + Pull + + + Push + + + Sync + + + wrote + + + Submit your review for + + + Your review summary + + + Comment only + + + Approve + + + Request changes + + + Comments + + + Outdated comments + + + Create New + + + Assignee + + + Author + + + Sign in with your browser + Open + + Filter by Author + + + Select Fork + Are you sure you want to delete this comment? @@ -446,4 +539,43 @@ Retry + + There aren't any open pull requests + + + Pull requests let you tell others about changes you've pushed to a repository on GitHub + + + No results matched your search. + + + To get started you can + + + create a pull request + + + Open repository at '{0}'? + + + The target URL has a different owner to the current repository. + + + There is no active repository to navigate + + + This file has changed since the permalink was created + + + Please open the repository '{0}' and try again + + + Couldn't open from '{0}'. Only URLs that link to repository files are currently supported. + + + Couldn't a find a GitHub URL in clipboard + + + Couldn't find target URL in current repository. Try again after doing a fetch. + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.zh-CN.resx b/src/GitHub.VisualStudio.UI/Resources.zh-CN.resx new file mode 100644 index 0000000000..77c2088272 --- /dev/null +++ b/src/GitHub.VisualStudio.UI/Resources.zh-CN.resx @@ -0,0 +1,578 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 无效的验证码 + + + 尝试再次输入代码或单击重新发送按钮以获取新的验证码。 + + + 验证码已发送！ + + + 如果您没有收到验证码，请联系 support@github.com 。 + + + 浏览 + + + 无法连接到github.com + + + 无法连接服务器 + + + 创建 + + + 说明(可选) + + + 在浏览器中打开 + + + 取消 + + + Gist已创建 + + + 创建Gist失败 + + + 由 + + + 隐私 + + + 通过发送匿名使用数据来帮助我们改进 + + + 无法复制到剪贴板，请重试。 + + + 链接已经复制到剪贴板 + + + 版本库创建成功。 + + + 私有Gist + + + 文件名 + + + 你没有登录到 {0},因此操作可能才会失败. [立即登录]({1}) + + + 维基 + + + 脉冲 + + + 拉取请求 + + + 路径 + + + 问题 + + + 图表 + + + 发布至GitHub + + + 让您的开源和私有项目拥有强大的协作、代码审查、以及代码管理。 + + + 连接... + + + 克隆 + + + 验证 + + + 双重身份验证 + + + 注册 + + + 注销 + + + 再次将验证码短信发送至您的注册手机中 + + + 重新发送 + + + 存储库名称 + + + 这个存储库没有托管至远程。填写表单，将其发布到Github。 + + + 发布 + + + 或 + + + 在你的手机上打开双重身份验证App查看验证码。 + + + 没有存储库 + + + 名称 + + + 私有存储库 + + + 登录失败。 + + + 本地路径 + + + 许可证 + + + 了解详细信息 + + + Git忽略 + + + 搜索存储库 + + + 部分或全部存储库没有加载，请关闭对话框重试。 + + + 加载存储库时发送意外。 + + + GitHub企业服务器地址 + + + 无效主机或不是GitHub企业服务器，请检查地址并重试。 + + + 用户名或电子邮件 + + + 密码 + + + 检查您的用户名和密码然后重试 + + + 登录 + + + (是否忘记了您的密码?) + + + 请检查你的 Internet 连接，然后重试。 + + + 没有GitHub企业版？ + + + 没有帐户? + + + 标题(必须) + + + 描述 + + + 将此存储库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 + + + 此存储库未托管至Github + + + 没有存储库 + + + 我们在这里找不到 git 存储库。打开一个 git 项目或单击项目中的 "文件"-> "添加到源代码管理" 以开始. + + + 创建帐户 + + + 筛选分支 + + + 发布到 GitHub + + + 入门 + + + 登录 + + + 登录... + + + 本地分支最新! + + + 变更:({0}） + + + 查看变更 + + + 将比较文件作为默认操作 + + + 查看文件 + + + 将打开文件作为默认操作 + + + 切换到列表视图 + + + 切换到树视图 + + + 已更新“{0}” + + + 在GitHub上查看拉取请求 + + + 欢迎使用 GitHub for Visual Studio！ 您可以先看看这里 [培训](show-training) 或[文档](show-docs)? + +[不再显示](dont-show-again) + + + 已更新 + + + 在编辑器边缘显示PR注释 + + + 实验性功能 + + + 我们将在未来的版本中改变此功能。 + + + 在解决方案中查看更新 + + + 解决方案中打开文件 + + + 令牌 + + + 继续复审 + + + 添加复审 + + + 复审人员 + + + 添加复审注释 + + + 添加评论 + + + Fork + + + 调试 + + + 启用日志跟踪 + + + GitHub括在在Blend内部无效 + + + 在团队资源管理器中显示分叉按钮 + + + 更新注释 + + + 取消 + + + 挂起 + + + 开始复审 + + + 您必须提交和推送更改, 才能在此添加注释。 + + + 上一个评论 + + + 下一个评论 + + + 查看、签出或创建拉取请求 + + + 返回 + + + Fork存储库 + + + Fork此存储库 + + + 更新本地存储库的 + + + 要指向 + + + 创建拉取请求 + + + 登录GitHub + + + 拉取 + + + 推送 + + + 同步 + + + 已写 + + + 提交你的批注 + + + 你的批注概要 + + + 仅批注 + + + 批准 + + + 请求变更 + + + 批注 + + + 过期批注 + + + 创建 + + + 分配 + + + 作者 + + + 使用浏览器登录 + + + 打开 + + + 按作者过滤 + + + 选择Fork + + + 这里没有任何打开的推送请求 + + + 通过推送请求告诉其他人关于你推送到一个GitHub存储库的变更 + + + 您的搜索没有匹配结果 + + + 现在开始你可以 + + + 创建拉取请求 + + + 您确定要删除此注释吗? + + + 删除注释 + + + 在“{0}”打开存储库? + + + 目标URL与当前存储库拥有者不同。 + + + 没有活动的存储库可以导航 + + + 自创建固定链接以来，此文件已更改 + + + 请打开存储库“{0}”，然后重试 + + + 无法从“{0}”打开。目前仅支持链接到存储库文件的URL。 + + + 无法在剪贴板中找到GitHub网址！ + + + 无法在当前存储库中找到目标URL。在进行提取后再试一次。 + + diff --git a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs index 7e824c62a1..7476a6eb58 100644 --- a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs +++ b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs @@ -4,6 +4,7 @@ using GitHub.Exports; using GitHub.Services; using GitHub.Services.Vssdk.Commands; +using GitHub.VisualStudio.UI; using Microsoft.VisualStudio.Shell; using Task = System.Threading.Tasks.Task; @@ -12,13 +13,7 @@ namespace GitHub.VisualStudio.Commands [Export(typeof(IOpenFromClipboardCommand))] public class OpenFromClipboardCommand : VsCommand, IOpenFromClipboardCommand { - public const string NoGitHubUrlMessage = "Couldn't a find a GitHub URL in clipboard"; - public const string NoResolveSameOwnerMessage = "Couldn't find target URL in current repository. Try again after doing a fetch."; - public const string NoResolveDifferentOwnerMessage = "The target URL has a different owner to the current repository."; - public const string NoActiveRepositoryMessage = "There is no active repository to navigate"; - public const string ChangesInWorkingDirectoryMessage = "This file has changed since the permalink was created"; - public const string DifferentRepositoryMessage = "Please open the repository '{0}' and try again"; - public const string UnknownLinkTypeMessage = "Couldn't open from '{0}'. Only URLs that link to repository files are currently supported."; + readonly Lazy gitHubContextService; readonly Lazy teamExplorerContext; @@ -58,13 +53,13 @@ public override async Task Execute(string url) var context = gitHubContextService.Value.FindContextFromClipboard(); if (context == null) { - vsServices.Value.ShowMessageBoxInfo(NoGitHubUrlMessage); + vsServices.Value.ShowMessageBoxInfo(Resources.NoGitHubUrlMessage); return; } if (context.LinkType != LinkType.Blob) { - var message = string.Format(UnknownLinkTypeMessage, context.Url); + var message = string.Format(Resources.UnknownLinkTypeMessage, context.Url); vsServices.Value.ShowMessageBoxInfo(message); return; } @@ -73,13 +68,13 @@ public override async Task Execute(string url) var repositoryDir = activeRepository?.LocalPath; if (repositoryDir == null) { - vsServices.Value.ShowMessageBoxInfo(NoActiveRepositoryMessage); + vsServices.Value.ShowMessageBoxInfo(Resources.NoActiveRepositoryMessage); return; } if (!string.Equals(activeRepository.Name, context.RepositoryName, StringComparison.OrdinalIgnoreCase)) { - vsServices.Value.ShowMessageBoxInfo(string.Format(DifferentRepositoryMessage, context.RepositoryName)); + vsServices.Value.ShowMessageBoxInfo(string.Format(Resources.DifferentRepositoryMessage, context.RepositoryName)); return; } @@ -88,11 +83,11 @@ public override async Task Execute(string url) { if (!string.Equals(activeRepository.Owner, context.Owner, StringComparison.OrdinalIgnoreCase)) { - vsServices.Value.ShowMessageBoxInfo(NoResolveDifferentOwnerMessage); + vsServices.Value.ShowMessageBoxInfo(Resources.NoResolveDifferentOwnerMessage); } else { - vsServices.Value.ShowMessageBoxInfo(NoResolveSameOwnerMessage); + vsServices.Value.ShowMessageBoxInfo(Resources.NoResolveSameOwnerMessage); } return; @@ -109,7 +104,7 @@ public override async Task Execute(string url) return; } - vsServices.Value.ShowMessageBoxInfo(ChangesInWorkingDirectoryMessage); + vsServices.Value.ShowMessageBoxInfo(Resources.ChangesInWorkingDirectoryMessage); } gitHubContextService.Value.TryOpenFile(repositoryDir, context); diff --git a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs index 04e469ffc6..382b59511f 100644 --- a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs +++ b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs @@ -12,6 +12,7 @@ using Microsoft.VisualStudio.Shell.Interop; using Task = System.Threading.Tasks.Task; using SVsServiceProvider = Microsoft.VisualStudio.Shell.SVsServiceProvider; +using GitHub.VisualStudio.UI; namespace GitHub.VisualStudio.Commands { @@ -116,7 +117,7 @@ public override async Task Execute(string url) var solutionDir = FindSolutionDirectory(dte.Value.Solution); if (solutionDir == null || !ContainsDirectory(repositoryDir, solutionDir)) { - var result = ShowInfoMessage($"Open repository at '{repositoryDir}'?"); + var result = ShowInfoMessage(string.Format(Resources.OpenRepositoryAtDir, repositoryDir)); switch (result) { case VSConstants.MessageBoxResult.IDYES: diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 96f3a16159..35ea44df27 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -745,14 +745,14 @@ {1a1da411-8d1f-4578-80a6-04576bea2dc5} GitHub.App True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup; {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} GitHub.Exports.Reactive True - BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bDebugSymbolsProjectOutputGroup%3bBuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;BuiltProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup%3b @@ -784,7 +784,7 @@ {7f5ed78b-74a3-4406-a299-70cfb5885b8b} GitHub.InlineReviews True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup @@ -795,7 +795,7 @@ {50e277b8-8580-487a-8f8e-5c3b9fbf0f77} GitHub.StartPage True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup @@ -825,14 +825,14 @@ {346384dd-2445-4a28-af22-b45f3957bd89} GitHub.UI True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup; {d1dfbb0c-b570-4302-8f1e-2e3a19c41961} GitHub.VisualStudio.UI True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup; diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs deleted file mode 100644 index a224bebbd7..0000000000 --- a/src/GitHub.VisualStudio/Resources.Designer.cs +++ /dev/null @@ -1,603 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace GitHub.VisualStudio { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitHub.VisualStudio.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Invalid authentication code. - /// - public static string authenticationFailedLabelContent { - get { - return ResourceManager.GetString("authenticationFailedLabelContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Try entering the code again or clicking the resend button to get a new authentication code.. - /// - public static string authenticationFailedLabelMessage { - get { - return ResourceManager.GetString("authenticationFailedLabelMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Authentication code sent!. - /// - public static string authenticationSentLabelContent { - get { - return ResourceManager.GetString("authenticationSentLabelContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to If you do not receive the authentication code, contact support@github.com.. - /// - public static string authenticationSentLabelMessage { - get { - return ResourceManager.GetString("authenticationSentLabelMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects.. - /// - public static string BlurbText { - get { - return ResourceManager.GetString("BlurbText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Browse. - /// - public static string browsePathButtonContent { - get { - return ResourceManager.GetString("browsePathButtonContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cancel. - /// - public static string CancelLink { - get { - return ResourceManager.GetString("CancelLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Clone. - /// - public static string CloneLink { - get { - return ResourceManager.GetString("CloneLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not connect to github.com. - /// - public static string couldNotConnectToGitHubText { - get { - return ResourceManager.GetString("couldNotConnectToGitHubText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not connect to the server.. - /// - public static string couldNotConnectToTheServerText { - get { - return ResourceManager.GetString("couldNotConnectToTheServerText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Create. - /// - public static string CreateLink { - get { - return ResourceManager.GetString("CreateLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Description (Optional). - /// - public static string descriptionOptionalText { - get { - return ResourceManager.GetString("descriptionOptionalText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Description. - /// - public static string descriptionText { - get { - return ResourceManager.GetString("descriptionText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Don’t have an account? . - /// - public static string dontHaveAnAccountText { - get { - return ResourceManager.GetString("dontHaveAnAccountText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Don’t have GitHub Enterprise? . - /// - public static string dontHaveGitHubEnterpriseText { - get { - return ResourceManager.GetString("dontHaveGitHubEnterpriseText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Please check your internet connection and try again.. - /// - public static string dotComConnectionFailedMessageMessage { - get { - return ResourceManager.GetString("dotComConnectionFailedMessageMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The host isn't available or is not a GitHub Enterprise server. Check the address and try again.. - /// - public static string enterpriseConnectingFailedMessage { - get { - return ResourceManager.GetString("enterpriseConnectingFailedMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to GitHub Enterprise server address. - /// - public static string enterpriseUrlPromptText { - get { - return ResourceManager.GetString("enterpriseUrlPromptText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to File Name. - /// - public static string fileNameText { - get { - return ResourceManager.GetString("fileNameText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Search repositories. - /// - public static string filterTextPromptText { - get { - return ResourceManager.GetString("filterTextPromptText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to (forgot your password?). - /// - public static string ForgotPasswordLink { - get { - return ResourceManager.GetString("ForgotPasswordLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Get Started. - /// - public static string GetStartedLink { - get { - return ResourceManager.GetString("GetStartedLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Failed to create gist. - /// - public static string gistCreationFailedMessage { - get { - return ResourceManager.GetString("gistCreationFailedMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Connect…. - /// - public static string GitHubInvitationSectionConnectLabel { - get { - return ResourceManager.GetString("GitHubInvitationSectionConnectLabel", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Publish to GitHub. - /// - public static string GitHubPublishSectionTitle { - get { - return ResourceManager.GetString("GitHubPublishSectionTitle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Graphs. - /// - public static string GraphsNavigationItemText { - get { - return ResourceManager.GetString("GraphsNavigationItemText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Git ignore. - /// - public static string ignoreTemplateListText { - get { - return ResourceManager.GetString("ignoreTemplateListText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Issues. - /// - public static string IssuesNavigationItemText { - get { - return ResourceManager.GetString("IssuesNavigationItemText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Learn more. - /// - public static string learnMoreLink { - get { - return ResourceManager.GetString("learnMoreLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to License. - /// - public static string licenseListText { - get { - return ResourceManager.GetString("licenseListText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Some or all repositories may not have loaded. Close the dialog and try again.. - /// - public static string loadingFailedMessageContent { - get { - return ResourceManager.GetString("loadingFailedMessageContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to An error occurred while loading repositories. - /// - public static string loadingFailedMessageMessage { - get { - return ResourceManager.GetString("loadingFailedMessageMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Local path. - /// - public static string localPathText { - get { - return ResourceManager.GetString("localPathText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Check your username and password, then try again. - /// - public static string LoginFailedMessage { - get { - return ResourceManager.GetString("LoginFailedMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Login failed.. - /// - public static string LoginFailedText { - get { - return ResourceManager.GetString("LoginFailedText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Login. - /// - public static string LoginLink { - get { - return ResourceManager.GetString("LoginLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Private Repository. - /// - public static string makePrivateContent { - get { - return ResourceManager.GetString("makePrivateContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Private Gist. - /// - public static string makePrivateGist { - get { - return ResourceManager.GetString("makePrivateGist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Name. - /// - public static string nameText { - get { - return ResourceManager.GetString("nameText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to To use this feature you need to sign in again.. - /// - public static string needLogout { - get { - return ResourceManager.GetString("needLogout", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to No repositories. - /// - public static string noRepositoriesMessageText { - get { - return ResourceManager.GetString("noRepositoriesMessageText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You are not logged in to {0}, so certain git operations may fail. [Login now]({1}). - /// - public static string NotLoggedInMessage { - get { - return ResourceManager.GetString("NotLoggedInMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code.. - /// - public static string openTwoFactorAuthAppText { - get { - return ResourceManager.GetString("openTwoFactorAuthAppText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to or. - /// - public static string orText { - get { - return ResourceManager.GetString("orText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Password. - /// - public static string PasswordPrompt { - get { - return ResourceManager.GetString("PasswordPrompt", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Path. - /// - public static string pathText { - get { - return ResourceManager.GetString("pathText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Publish. - /// - public static string publishText { - get { - return ResourceManager.GetString("publishText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Pull Requests. - /// - public static string PullRequestsNavigationItemText { - get { - return ResourceManager.GetString("PullRequestsNavigationItemText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Pulse. - /// - public static string PulseNavigationItemText { - get { - return ResourceManager.GetString("PulseNavigationItemText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub.. - /// - public static string RepoDoesNotHaveRemoteText { - get { - return ResourceManager.GetString("RepoDoesNotHaveRemoteText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Repository Name. - /// - public static string RepoNameText { - get { - return ResourceManager.GetString("RepoNameText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Repository created successfully.. - /// - public static string RepositoryPublishedMessage { - get { - return ResourceManager.GetString("RepositoryPublishedMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resend. - /// - public static string resendCodeButtonContent { - get { - return ResourceManager.GetString("resendCodeButtonContent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Send the code to your registered SMS Device again. - /// - public static string resendCodeButtonToolTip { - get { - return ResourceManager.GetString("resendCodeButtonToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sign out. - /// - public static string SignOutLink { - get { - return ResourceManager.GetString("SignOutLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sign up. - /// - public static string SignUpLink { - get { - return ResourceManager.GetString("SignUpLink", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Two-factor authentication. - /// - public static string twoFactorAuthText { - get { - return ResourceManager.GetString("twoFactorAuthText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Username or email. - /// - public static string UserNameOrEmailPromptText { - get { - return ResourceManager.GetString("UserNameOrEmailPromptText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Verify. - /// - public static string verifyText { - get { - return ResourceManager.GetString("verifyText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Wiki. - /// - public static string WikiNavigationItemText { - get { - return ResourceManager.GetString("WikiNavigationItemText", resourceCulture); - } - } - } -} diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml b/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml index 0477774a24..55b8444955 100644 --- a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml +++ b/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf" xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" + xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" xmlns:ui="https://github.com/github/VisualStudio" VerticalAlignment="Top" Margin="8" @@ -53,9 +54,8 @@ - - Fork the repository + @@ -66,7 +66,9 @@ - Update your local repository's origin to point to + + origin + @@ -93,8 +95,8 @@ Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}" HorizontalAlignment="Left" /> - - +