From 1d1225bc82c308093bbe055528f7745fbbc5ce20 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Fri, 1 Jun 2018 20:21:20 +0800 Subject: [PATCH 01/19] Start localization --- src/GitHub.App/GitHub.App.csproj | 1 + src/GitHub.App/Resources.Designer.cs | 166 +++---- src/GitHub.App/Resources.zh-Hans.resx | 237 ++++++++++ .../GitHub.InlineReviews.csproj | 6 + src/GitHub.InlineReviews/VSPackage.de.resx | 120 +++++ src/GitHub.InlineReviews/VSPackage.fr.resx | 120 +++++ src/GitHub.InlineReviews/VSPackage.it.resx | 120 +++++ src/GitHub.InlineReviews/VSPackage.ru.resx | 120 +++++ .../VSPackage.zh-Hans.resx | 120 +++++ .../VSPackage.zh-Hant.resx | 120 +++++ .../GitHub.VisualStudio.UI.csproj | 1 + .../Resources.zh-Hans.resx | 414 ++++++++++++++++++ .../GitHub.VisualStudio.csproj | 7 +- .../GitHub.VisualStudio.en-US.vsct | 215 +++++++++ .../GitHub.VisualStudio.vsct | 191 +------- .../GitHub.VisualStudio.zh-Hans.vsct | 215 +++++++++ .../VSPackage.zh-Hans.resx | 126 ++++++ 17 files changed, 2024 insertions(+), 275 deletions(-) create mode 100644 src/GitHub.App/Resources.zh-Hans.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.de.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.fr.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.it.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.ru.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.zh-Hans.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.zh-Hant.resx create mode 100644 src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx create mode 100644 src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct create mode 100644 src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct create mode 100644 src/GitHub.VisualStudio/VSPackage.zh-Hans.resx diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index 5a305566ea..227edaed31 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -407,6 +407,7 @@ Resources.Designer.cs Designer + diff --git a/src/GitHub.App/Resources.Designer.cs b/src/GitHub.App/Resources.Designer.cs index eff3ee69fb..cd34a343ca 100644 --- a/src/GitHub.App/Resources.Designer.cs +++ b/src/GitHub.App/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace GitHub.App { /// - /// 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")] + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 使用此强类型资源类，为所有资源查找 + /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to add. + /// 查找类似 add 的本地化字符串。 /// public static string AddedFileStatus { get { @@ -70,7 +70,7 @@ public static string AddedFileStatus { } /// - /// Looks up a localized string similar to Approved. + /// 查找类似 Approved 的本地化字符串。 /// public static string Approved { get { @@ -79,7 +79,7 @@ public static string Approved { } /// - /// Looks up a localized string similar to Select a containing folder for your new repository.. + /// 查找类似 Select a containing folder for your new repository. 的本地化字符串。 /// public static string BrowseForDirectory { get { @@ -88,7 +88,7 @@ public static string BrowseForDirectory { } /// - /// Looks up a localized string similar to Changes Requested. + /// 查找类似 Changes Requested 的本地化字符串。 /// public static string ChangesRequested { get { @@ -97,7 +97,7 @@ public static string ChangesRequested { } /// - /// Looks up a localized string similar to Clone a {0} Repository. + /// 查找类似 Clone a {0} Repository 的本地化字符串。 /// public static string CloneTitle { get { @@ -106,7 +106,7 @@ public static string CloneTitle { } /// - /// Looks up a localized string similar to Commented. + /// 查找类似 Commented 的本地化字符串。 /// public static string Commented { get { @@ -115,7 +115,7 @@ public static string Commented { } /// - /// Looks up a localized string similar to Could not connect to github.com. + /// 查找类似 Could not connect to github.com 的本地化字符串。 /// public static string CouldNotConnectToGitHub { get { @@ -124,10 +124,10 @@ public static string CouldNotConnectToGitHub { } /// - /// Looks up a localized string similar to Couldn't find Git.exe on PATH. + /// 查找类似 Couldn't find Git.exe on PATH. /// ///Please install Git for Windows from: - ///https://git-scm.com/download/win. + ///https://git-scm.com/download/win 的本地化字符串。 /// public static string CouldntFindGitOnPath { get { @@ -136,7 +136,7 @@ public static string CouldntFindGitOnPath { } /// - /// Looks up a localized string similar to Create a GitHub Gist. + /// 查找类似 Create a GitHub Gist 的本地化字符串。 /// public static string CreateGistTitle { get { @@ -145,7 +145,7 @@ public static string CreateGistTitle { } /// - /// Looks up a localized string similar to Create a {0} Repository. + /// 查找类似 Create a {0} Repository 的本地化字符串。 /// public static string CreateTitle { get { @@ -154,7 +154,7 @@ public static string CreateTitle { } /// - /// Looks up a localized string similar to GistFromVisualStudio.cs. + /// 查找类似 GistFromVisualStudio.cs 的本地化字符串。 /// public static string DefaultGistFileName { get { @@ -163,7 +163,7 @@ public static string DefaultGistFileName { } /// - /// Looks up a localized string similar to Please enter an Enterprise URL. + /// 查找类似 Please enter an Enterprise URL 的本地化字符串。 /// public static string EnterpriseUrlValidatorEmpty { get { @@ -172,7 +172,7 @@ public static string EnterpriseUrlValidatorEmpty { } /// - /// Looks up a localized string similar to Please enter a valid Enterprise URL. + /// 查找类似 Please enter a valid Enterprise URL 的本地化字符串。 /// public static string EnterpriseUrlValidatorInvalid { get { @@ -181,7 +181,7 @@ public static string EnterpriseUrlValidatorInvalid { } /// - /// Looks up a localized string similar to Not an Enterprise server. Please enter an Enterprise URL. + /// 查找类似 Not an Enterprise server. Please enter an Enterprise URL 的本地化字符串。 /// public static string EnterpriseUrlValidatorNotAGitHubHost { get { @@ -190,7 +190,7 @@ public static string EnterpriseUrlValidatorNotAGitHubHost { } /// - /// Looks up a localized string similar to (forgot your password?). + /// 查找类似 (forgot your password?) 的本地化字符串。 /// public static string ForgotPasswordLink { get { @@ -199,7 +199,7 @@ public static string ForgotPasswordLink { } /// - /// Looks up a localized string similar to fork. + /// 查找类似 fork 的本地化字符串。 /// public static string Fork { get { @@ -208,16 +208,16 @@ public static string Fork { } /// - /// Looks up a localized string similar to Fork Repository. + /// 查找类似 Fork Repository 的本地化字符串。 /// - internal static string ForkRepositoryTitle { + public static string ForkRepositoryTitle { get { return ResourceManager.GetString("ForkRepositoryTitle", resourceCulture); } } /// - /// Looks up a localized string similar to InProgress. + /// 查找类似 InProgress 的本地化字符串。 /// public static string InProgress { get { @@ -226,7 +226,7 @@ public static string InProgress { } /// - /// Looks up a localized string similar to [invalid]. + /// 查找类似 [invalid] 的本地化字符串。 /// public static string InvalidBranchName { get { @@ -235,7 +235,7 @@ public static string InvalidBranchName { } /// - /// Looks up a localized string similar to Make sure to use your password and not a Personal Access token to sign in.. + /// 查找类似 Make sure to use your password and not a Personal Access token to sign in. 的本地化字符串。 /// public static string LoginFailedForbiddenMessage { get { @@ -244,7 +244,7 @@ public static string LoginFailedForbiddenMessage { } /// - /// Looks up a localized string similar to Check your username and password, then try again. + /// 查找类似 Check your username and password, then try again 的本地化字符串。 /// public static string LoginFailedMessage { get { @@ -253,7 +253,7 @@ public static string LoginFailedMessage { } /// - /// Looks up a localized string similar to Sign in failed.. + /// 查找类似 Sign in failed. 的本地化字符串。 /// public static string LoginFailedText { get { @@ -262,7 +262,7 @@ public static string LoginFailedText { } /// - /// Looks up a localized string similar to Connect To GitHub. + /// 查找类似 Connect To GitHub 的本地化字符串。 /// public static string LoginTitle { get { @@ -271,7 +271,7 @@ public static string LoginTitle { } /// - /// Looks up a localized string similar to You must pull before you can push. + /// 查找类似 You must pull before you can push 的本地化字符串。 /// public static string MustPullBeforePush { get { @@ -280,7 +280,7 @@ public static string MustPullBeforePush { } /// - /// Looks up a localized string similar to Checkout PR branch before navigating to Editor. + /// 查找类似 Checkout PR branch before navigating to Editor 的本地化字符串。 /// public static string NavigateToEditorNotCheckedOutInfoMessage { get { @@ -289,7 +289,7 @@ public static string NavigateToEditorNotCheckedOutInfoMessage { } /// - /// Looks up a localized string similar to Press Enter to navigate to Editor (PR branch must be checked out). + /// 查找类似 Press Enter to navigate to Editor (PR branch must be checked out) 的本地化字符串。 /// public static string NavigateToEditorNotCheckedOutStatusMessage { get { @@ -298,7 +298,7 @@ public static string NavigateToEditorNotCheckedOutStatusMessage { } /// - /// Looks up a localized string similar to Press Enter to navigate to Editor. + /// 查找类似 Press Enter to navigate to Editor 的本地化字符串。 /// public static string NavigateToEditorStatusMessage { get { @@ -307,7 +307,7 @@ public static string NavigateToEditorStatusMessage { } /// - /// Looks up a localized string similar to No commits to pull. + /// 查找类似 No commits to pull 的本地化字符串。 /// public static string NoCommitsToPull { get { @@ -316,7 +316,7 @@ public static string NoCommitsToPull { } /// - /// Looks up a localized string similar to No commits to push. + /// 查找类似 No commits to push 的本地化字符串。 /// public static string NoCommitsToPush { get { @@ -325,7 +325,7 @@ public static string NoCommitsToPush { } /// - /// Looks up a localized string similar to *No description provided.*. + /// 查找类似 *No description provided.* 的本地化字符串。 /// public static string NoDescriptionProvidedMarkdown { get { @@ -334,7 +334,7 @@ public static string NoDescriptionProvidedMarkdown { } /// - /// Looks up a localized string similar to Please enter your password. + /// 查找类似 Please enter your password 的本地化字符串。 /// public static string PasswordValidatorEmpty { get { @@ -343,7 +343,7 @@ public static string PasswordValidatorEmpty { } /// - /// Looks up a localized string similar to Pull Request for branch **{0}** created successfully at [{1}]({2}). + /// 查找类似 Pull Request for branch **{0}** created successfully at [{1}]({2}) 的本地化字符串。 /// public static string PRCreatedUpstream { get { @@ -352,7 +352,7 @@ public static string PRCreatedUpstream { } /// - /// Looks up a localized string similar to Publish repository. + /// 查找类似 Publish repository 的本地化字符串。 /// public static string PublishTitle { get { @@ -361,7 +361,7 @@ public static string PublishTitle { } /// - /// Looks up a localized string similar to Publish repository to {0}. + /// 查找类似 Publish repository to {0} 的本地化字符串。 /// public static string PublishToTitle { get { @@ -370,7 +370,7 @@ public static string PublishToTitle { } /// - /// Looks up a localized string similar to Please enter a title for the Pull Request. + /// 查找类似 Please enter a title for the Pull Request 的本地化字符串。 /// public static string PullRequestCreationTitleValidatorEmpty { get { @@ -379,7 +379,7 @@ public static string PullRequestCreationTitleValidatorEmpty { } /// - /// Looks up a localized string similar to Checkout {0}. + /// 查找类似 Checkout {0} 的本地化字符串。 /// public static string PullRequestDetailsCheckout { get { @@ -388,7 +388,7 @@ public static string PullRequestDetailsCheckout { } /// - /// Looks up a localized string similar to Checkout to {0}. + /// 查找类似 Checkout to {0} 的本地化字符串。 /// public static string PullRequestDetailsCheckoutTo { get { @@ -397,7 +397,7 @@ public static string PullRequestDetailsCheckoutTo { } /// - /// Looks up a localized string similar to Pull from {0} branch {1}. + /// 查找类似 Pull from {0} branch {1} 的本地化字符串。 /// public static string PullRequestDetailsPullToolTip { get { @@ -406,7 +406,7 @@ public static string PullRequestDetailsPullToolTip { } /// - /// Looks up a localized string similar to Push to {0} branch {1}. + /// 查找类似 Push to {0} branch {1} 的本地化字符串。 /// public static string PullRequestDetailsPushToolTip { get { @@ -415,7 +415,7 @@ public static string PullRequestDetailsPushToolTip { } /// - /// Looks up a localized string similar to Pull Request. + /// 查找类似 Pull Request 的本地化字符串。 /// public static string PullRequestNavigationItemText { get { @@ -424,7 +424,7 @@ public static string PullRequestNavigationItemText { } /// - /// Looks up a localized string similar to Pull Requests. + /// 查找类似 Pull Requests 的本地化字符串。 /// public static string PullRequestsNavigationItemText { get { @@ -433,7 +433,7 @@ public static string PullRequestsNavigationItemText { } /// - /// Looks up a localized string similar to Source and target branch cannot be the same. + /// 查找类似 Source and target branch cannot be the same 的本地化字符串。 /// public static string PullRequestSourceAndTargetBranchTheSame { get { @@ -442,7 +442,7 @@ public static string PullRequestSourceAndTargetBranchTheSame { } /// - /// Looks up a localized string similar to Source branch doesn't exist remotely, have you pushed it?. + /// 查找类似 Source branch doesn't exist remotely, have you pushed it? 的本地化字符串。 /// public static string PullRequestSourceBranchDoesNotExist { get { @@ -451,7 +451,7 @@ public static string PullRequestSourceBranchDoesNotExist { } /// - /// Looks up a localized string similar to remote. + /// 查找类似 remote 的本地化字符串。 /// public static string Remote { get { @@ -460,7 +460,7 @@ public static string Remote { } /// - /// Looks up a localized string similar to rename. + /// 查找类似 rename 的本地化字符串。 /// public static string RenamedFileStatus { get { @@ -469,7 +469,7 @@ public static string RenamedFileStatus { } /// - /// Looks up a localized string similar to No selected repository.. + /// 查找类似 No selected repository. 的本地化字符串。 /// public static string RepositoryCloneFailedNoSelectedRepo { get { @@ -478,7 +478,7 @@ public static string RepositoryCloneFailedNoSelectedRepo { } /// - /// Looks up a localized string similar to Please enter a repository path. + /// 查找类似 Please enter a repository path 的本地化字符串。 /// public static string RepositoryCreationClonePathEmpty { get { @@ -487,7 +487,7 @@ public static string RepositoryCreationClonePathEmpty { } /// - /// Looks up a localized string similar to Please enter a valid path. + /// 查找类似 Please enter a valid path 的本地化字符串。 /// public static string RepositoryCreationClonePathInvalid { get { @@ -496,7 +496,7 @@ public static string RepositoryCreationClonePathInvalid { } /// - /// Looks up a localized string similar to Path contains invalid characters. + /// 查找类似 Path contains invalid characters 的本地化字符串。 /// public static string RepositoryCreationClonePathInvalidCharacters { get { @@ -505,7 +505,7 @@ public static string RepositoryCreationClonePathInvalidCharacters { } /// - /// Looks up a localized string similar to Path too long. + /// 查找类似 Path too long 的本地化字符串。 /// public static string RepositoryCreationClonePathTooLong { get { @@ -514,7 +514,7 @@ public static string RepositoryCreationClonePathTooLong { } /// - /// Looks up a localized string similar to Repository '{0}/{1}' already exists.. + /// 查找类似 Repository '{0}/{1}' already exists. 的本地化字符串。 /// public static string RepositoryCreationFailedAlreadyExists { get { @@ -523,7 +523,7 @@ public static string RepositoryCreationFailedAlreadyExists { } /// - /// Looks up a localized string similar to Change the repository name or select a different account and try again.. + /// 查找类似 Change the repository name or select a different account and try again. 的本地化字符串。 /// public static string RepositoryCreationFailedAlreadyExistsMessage { get { @@ -532,7 +532,7 @@ public static string RepositoryCreationFailedAlreadyExistsMessage { } /// - /// Looks up a localized string similar to Exceeded private repositories quota.. + /// 查找类似 Exceeded private repositories quota. 的本地化字符串。 /// public static string RepositoryCreationFailedQuota { get { @@ -541,7 +541,7 @@ public static string RepositoryCreationFailedQuota { } /// - /// Looks up a localized string similar to Repository with same name already exists at this location. + /// 查找类似 Repository with same name already exists at this location 的本地化字符串。 /// public static string RepositoryNameValidatorAlreadyExists { get { @@ -550,7 +550,7 @@ public static string RepositoryNameValidatorAlreadyExists { } /// - /// Looks up a localized string similar to Please enter a repository name. + /// 查找类似 Please enter a repository name 的本地化字符串。 /// public static string RepositoryNameValidatorEmpty { get { @@ -559,7 +559,7 @@ public static string RepositoryNameValidatorEmpty { } /// - /// Looks up a localized string similar to Repository name must be fewer than 100 characters. + /// 查找类似 Repository name must be fewer than 100 characters 的本地化字符串。 /// public static string RepositoryNameValidatorTooLong { get { @@ -568,7 +568,7 @@ public static string RepositoryNameValidatorTooLong { } /// - /// Looks up a localized string similar to Will be created as {0}. + /// 查找类似 Will be created as {0} 的本地化字符串。 /// public static string SafeRepositoryNameWarning { get { @@ -577,7 +577,7 @@ public static string SafeRepositoryNameWarning { } /// - /// Looks up a localized string similar to The source repository is no longer available.. + /// 查找类似 The source repository is no longer available. 的本地化字符串。 /// public static string SourceRepositoryNoLongerAvailable { get { @@ -586,16 +586,16 @@ public static string SourceRepositoryNoLongerAvailable { } /// - /// Looks up a localized string similar to Switch Origin. + /// 查找类似 Switch Origin 的本地化字符串。 /// - internal static string SwitchOriginTitle { + public static string SwitchOriginTitle { get { return ResourceManager.GetString("SwitchOriginTitle", resourceCulture); } } /// - /// Looks up a localized string similar to Sync {0} submodules. + /// 查找类似 Sync {0} submodules 的本地化字符串。 /// public static string SyncSubmodules { get { @@ -604,7 +604,7 @@ public static string SyncSubmodules { } /// - /// Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code.. + /// 查找类似 Open the two-factor authentication app on your device to view your authentication code. 的本地化字符串。 /// public static string TwoFactorApp { get { @@ -613,7 +613,7 @@ public static string TwoFactorApp { } /// - /// Looks up a localized string similar to We sent you a message via SMS with your authentication code.. + /// 查找类似 We sent you a message via SMS with your authentication code. 的本地化字符串。 /// public static string TwoFactorSms { get { @@ -622,7 +622,7 @@ public static string TwoFactorSms { } /// - /// Looks up a localized string similar to Two-Factor authentication required. + /// 查找类似 Two-Factor authentication required 的本地化字符串。 /// public static string TwoFactorTitle { get { @@ -631,7 +631,7 @@ public static string TwoFactorTitle { } /// - /// Looks up a localized string similar to Enter a sign in authentication code here. + /// 查找类似 Enter a sign in authentication code here 的本地化字符串。 /// public static string TwoFactorUnknown { get { @@ -640,7 +640,7 @@ public static string TwoFactorUnknown { } /// - /// Looks up a localized string similar to Please enter your username or email address. + /// 查找类似 Please enter your username or email address 的本地化字符串。 /// public static string UsernameOrEmailValidatorEmpty { get { @@ -649,7 +649,7 @@ public static string UsernameOrEmailValidatorEmpty { } /// - /// Looks up a localized string similar to Username or email address must not have spaces. + /// 查找类似 Username or email address must not have spaces 的本地化字符串。 /// public static string UsernameOrEmailValidatorSpaces { get { @@ -658,7 +658,7 @@ public static string UsernameOrEmailValidatorSpaces { } /// - /// Looks up a localized string similar to Cannot checkout as your working directory has uncommitted changes.. + /// 查找类似 Cannot checkout as your working directory has uncommitted changes. 的本地化字符串。 /// public static string WorkingDirectoryHasUncommittedCHanges { get { diff --git a/src/GitHub.App/Resources.zh-Hans.resx b/src/GitHub.App/Resources.zh-Hans.resx new file mode 100644 index 0000000000..abd82218ed --- /dev/null +++ b/src/GitHub.App/Resources.zh-Hans.resx @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 克隆一个 git 仓库 + + + 无法连接到github.com！ + + + 创建一个GitHub Gist！ + + + 创建一个{0}存储库！ + + + GistFromVisualStudio.cs！ + + + 请输入企业网址！ + + + 请输入有效网址 + + + 是否忘记了您的密码? + + + 您的用户名和密码 + + + 登录失败 + + + 连接到 GitHub + + + 请输入您的密码。 + + + 发布存储库 + + + 已添加库到书签 '%s' + + + 请输入请求的标题! + + + 源和目标分支不能相同! + + + 选择了项目。 + + + 请输入名称 + + + 请输入有效路径 + + + 包含无效字符 + + + 路径太长 + + + % 1 已经存在 。 + + + 请选择一个表单并且重试。 + + + 私密文档 + + + 同名的广告活动已存在 + + + 请输入姓名 + + + 这个名字不能超过100个字符 + + + 新增就业岗位0个 + + + 在您的手机上安装双重验证程序：Google Authenticator + + + {0}向您发送了一条消息。 + + + 双重身份认证 + + + 输入任何你喜欢的一个标志 % ， + + + 请输入您的用户名或邮箱地址. + + + 用户名或电子邮件地址 + + + 拉取请求 + + + Pull 请求 + + + 添加... + + + 餐叉 + + + #无效 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index ec6a0f63d9..fe386c7997 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -419,11 +419,17 @@ + + + true VSPackage Designer + + + diff --git a/src/GitHub.InlineReviews/VSPackage.de.resx b/src/GitHub.InlineReviews/VSPackage.de.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.de.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.fr.resx b/src/GitHub.InlineReviews/VSPackage.fr.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.fr.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.it.resx b/src/GitHub.InlineReviews/VSPackage.it.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.it.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.ru.resx b/src/GitHub.InlineReviews/VSPackage.ru.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx b/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx b/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index c6b964af59..e2a5a229f7 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -256,6 +256,7 @@ Resources.Designer.cs Designer + diff --git a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx new file mode 100644 index 0000000000..d83c1fbf96 --- /dev/null +++ b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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！ + + + 无法连接服务器 + + + 创建 + + + 说明(可选) + + + 在浏览器中打开 + + + 取消 + + + 创建成功! + + + 创建标签失败 + + + 通过 + + + 隐私 + + + 通过发送匿名使用数据来帮助我们改进! + + + 找不到标签。请再试一次。 + + + 已复制到剪贴板！ + + + 已成功创建存储库! + + + 隐私 + + + 文件名 + + + 您没有登录到 {0}, 因此某些 git 操作可能会失败。[立即登录]({1})! + + + Wiki + + + 脉冲 + + + 拉取请求 + + + 路径 + + + 问题 + + + 图形 + + + 连接 + + + 克隆 + + + 验证(&V): + + + 双重身份验证 + + + 注册 + + + 注销 + + + 将以下代码添加到您的<code>functions.php</code>。 + + + 重新发送 + + + 存储库名称 + + + 发布 + + + 或: + + + 在您的手机上安装双重验证程序：Google Authenticator + + + 没有定义存储库. + + + 名称: + + + 专用存储库 + + + 登录失败 + + + 本地路径: + + + 许可证 + + + 了解详细信息 + + + 忽略 + + + 搜索存储库 + + + 加载日历时出错： + + + 服务器地址 + + + 用户名或电子邮件 + + + 密码: + + + 您的用户名和密码 + + + 登录 + + + 是否忘记了您的密码? + + + 请检查你的 Internet 连接，然后重试。 + + + 您不必独自 + + + 没有帐户? + + + 标题必填 + + + 说明 + + + 将此存储库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 + + + 在 Github + + + 没有存储库! + + + 我们在这里找不到 git 存储库。打开一个 git 项目或单击项目中的 "文件-&gt;&gt; 添加到源代码管理" 以开始.! + + + 创建帐户 + + + 筛选分支 + + + 发布到 GitHub! + + + 欢迎 + + + 登录 + + + 登录 + + + 本地分支最新! + + + 更改: {0} + + + 查看更改 + + + 将比较文件作为默认操作 + + + 查看文件 + + + 将打开文件作为默认操作 + + + 切换到列表视图 + + + 切换到树视图 + + + 已更新“{0}” + + + 拉取 + + + Updated + + + 显示评论在 + + + 实验性功能 + + + 我们将在未来的版本中解锁此功能。 + + + 查看更新 + + + 解决方案中打开文件！ + + + 令牌 + + + 继续您的评论！ + + + 添加你的评价 + + + 审阅者 + + + 评价评论 + + + 添加评论 + + + 餐叉 + + + 正在调试 + + + AdtAgent 在启动期间遇到以下问题:%n\r\n任务:%t打开网络协议%n\r\n失败:%t无法创建网络协议%n\r\n错误:%t%1%n\r\n错误消息:%n%2%n\r\n%n\r\nAdtAgent 无法打开网络连接。%n\r\n%n\r\n有关详细的失败信息，请使用 TraceFlags 注册表项启用跟踪日志记录，并检查 Windows 目录的 \temp 子目录中的 AdtAgent.log。%n\r\n + + + 更新注释 + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index a985af82ba..f6c90053d0 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -433,8 +433,11 @@ VSPackage Designer + + + PreserveNewest true @@ -465,10 +468,10 @@ - + Menus.ctmenu Designer - + diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct new file mode 100644 index 0000000000..ec67c5e6af --- /dev/null +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + WindowToolBar + Window Toolbar + + + + + + + GitHub + GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct index d641900916..cadfbf6b1f 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct @@ -50,196 +50,7 @@ - - - - - WindowToolBar - Window Toolbar - - - - - - - GitHub - GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct new file mode 100644 index 0000000000..48354bb730 --- /dev/null +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + WindowToolBar + Window Toolbar + + + + + + + GitHub + GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx b/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx new file mode 100644 index 0000000000..018ffe5367 --- /dev/null +++ b/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + GitHub.VisualStudio + + + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + + \ No newline at end of file From 52d0e0ef82f2f22f483fb7b9f97ab05031593bb0 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sat, 2 Jun 2018 00:10:56 +0800 Subject: [PATCH 02/19] modify vsct file and tran chinese --- src/GitHub.App/Resources.zh-Hans.resx | 106 ++++++++++-- .../VSPackage.zh-Hans.resx | 8 +- src/GitHub.StartPage/GitHub.StartPage.csproj | 1 + src/GitHub.StartPage/Resources.zh-Hans.resx | 126 ++++++++++++++ src/GitHub.UI/GitHub.UI.csproj | 1 + src/GitHub.UI/Resources.zh-Hans.resx | 156 ++++++++++++++++++ .../Resources.zh-Hans.resx | 129 +++++++++------ .../GitHub.VisualStudio.csproj | 15 +- .../VSPackage.zh-Hans.resx | 2 +- 9 files changed, 475 insertions(+), 69 deletions(-) create mode 100644 src/GitHub.StartPage/Resources.zh-Hans.resx create mode 100644 src/GitHub.UI/Resources.zh-Hans.resx diff --git a/src/GitHub.App/Resources.zh-Hans.resx b/src/GitHub.App/Resources.zh-Hans.resx index abd82218ed..5ce6ef9b35 100644 --- a/src/GitHub.App/Resources.zh-Hans.resx +++ b/src/GitHub.App/Resources.zh-Hans.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 克隆一个 git 仓库 + 克隆一个 {0} 版本库 无法连接到github.com！ @@ -154,10 +154,10 @@ 请输入您的密码。 - 发布存储库 + 发布版本库 - 已添加库到书签 '%s' + 发布版本库至 {0} 请输入请求的标题! @@ -181,7 +181,7 @@ 路径太长 - % 1 已经存在 。 + 版本库 '{0}/{1}'已存在。 请选择一个表单并且重试。 @@ -199,13 +199,13 @@ 这个名字不能超过100个字符 - 新增就业岗位0个 + 将要创建为 {0} 在您的手机上安装双重验证程序：Google Authenticator - {0}向您发送了一条消息。 + 我们将发送一条验证码短信到您的手机。 双重身份认证 @@ -223,15 +223,101 @@ 拉取请求 - Pull 请求 + 推送请求 - 添加... + 添加 - 餐叉 + fork - #无效 + [无效] + + + 为新版本库选择文件夹。 + + + 不是企业服务器。请输入企业服务器 URL + + + 请确保使用您的密码而不是登录的个人访问令牌。 + + + 在 [{1}] ({2}) 上成功创建分支 ** {0} ** 拉取请求 + + + 远程不存在源分支, 你有没有推送它？ + + + 你必须先拉取再推送 + + + 没有需要拉取的提交 + + + 没有需要推送的提交 + + + * 未提供说明。* + + + 签出 {0} + + + 签出到 {0} + + + 从 {0} 分支 {1} 拉取 + + + 推至 {0} 分支 {1} + + + 远程 + + + 重命名 + + + 源存版本库不再可用。 + + + 无法签出, 因为您的工作目录有未提交的更改。 + + + 同步 {0} 子模块 + + + 在PATH 找不到 Git.exe。 + +请安装 Git for Windows : https://git-scm.com/download/win + + + 批准 + + + 更改需求 + + + 已评论 + + + 进行中 + + + 按回车键导航到编辑器 + + + 在导航到编辑器之前签出 PR 分支 + + + 按回车键导航到编辑器 (PR 分支必须签出) + + + Fork版本库 + + + 原始开关 \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx b/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx index d58980a38d..ac832854de 100644 --- a/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx +++ b/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + GitHub + + + 为开源和私有项目提供强大的协作、代码评审和代码管理。 + + \ No newline at end of file diff --git a/src/GitHub.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index ae7d07f227..bc6686dbc3 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -264,6 +264,7 @@ Resources.Designer.cs Designer + PublicResXFileCodeGenerator AutomationIDs.Designer.cs diff --git a/src/GitHub.UI/Resources.zh-Hans.resx b/src/GitHub.UI/Resources.zh-Hans.resx new file mode 100644 index 0000000000..a7677e55e3 --- /dev/null +++ b/src/GitHub.UI/Resources.zh-Hans.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} 年前 + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx index d83c1fbf96..02f90c8069 100644 --- a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx +++ b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx @@ -118,25 +118,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 发布成文件 + 发布至GitHub - 无效的验证码！ + 无效的验证码 - 尝试再次输入代码或单击重新发送按钮以获取新的验证代码。 + 尝试再次输入代码或单击【重新发送】按钮以获取新的验证码。 - 认证码 + 验证码已发送！ - 如果您没有收到验证码，请联系support@github.com。 + 如果您没有收到验证码，请联系 support@github.com 。 浏览 - 无法连接到github.com！ + 无法连接到github.com 无法连接服务器 @@ -154,13 +154,13 @@ 取消 - 创建成功! + Gist已创建 - 创建标签失败 + 创建Gist失败 - 通过 + 由 隐私 @@ -169,25 +169,25 @@ 通过发送匿名使用数据来帮助我们改进! - 找不到标签。请再试一次。 + 无法复制到剪贴板，请重试。 - 已复制到剪贴板！ + 链接已经复制到剪贴板 - 已成功创建存储库! + 版本库创建成功。 - 隐私 + 私有Gist 文件名 - 您没有登录到 {0}, 因此某些 git 操作可能会失败。[立即登录]({1})! + 你没有登录到 {0},因此操作可能才会失败. [立即登录]({1}) - Wiki + 维基 脉冲 @@ -205,13 +205,13 @@ 图形 - 连接 + 连接... 克隆 - 验证(&V): + 验证 双重身份验证 @@ -223,37 +223,37 @@ 注销 - 将以下代码添加到您的<code>functions.php</code>。 + 再次将验证码短信发送至您的注册手机中 重新发送 - 存储库名称 + 版本库名称 发布 - 或: + 或 - 在您的手机上安装双重验证程序：Google Authenticator + 在你的手机上打开双重身份验证App查看验证码。 - 没有定义存储库. + 没有版本库 - 名称: + 名称 - 专用存储库 + 私有版本库 - 登录失败 + 登录失败。 - 本地路径: + 本地路径 许可证 @@ -262,25 +262,25 @@ 了解详细信息 - 忽略 + Git忽略 - 搜索存储库 + 搜索版本库 - 加载日历时出错： + 加载版本库时发送意外。 - 服务器地址 + GitHub企业服务器地址 用户名或电子邮件 - 密码: + 密码 - 您的用户名和密码 + 检查您的用户名和密码然后重试 登录 @@ -292,25 +292,25 @@ 请检查你的 Internet 连接，然后重试。 - 您不必独自 + 没有GitHub企业版？ 没有帐户? - 标题必填 + 标题(必须) - 说明 + 描述 - 将此存储库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 + 将此版本库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 - 在 Github + 此版本库未托管至Github - 没有存储库! + 没有版本库 我们在这里找不到 git 存储库。打开一个 git 项目或单击项目中的 "文件-&gt;&gt; 添加到源代码管理" 以开始.! @@ -322,22 +322,22 @@ 筛选分支 - 发布到 GitHub! + 发布到 GitHub - 欢迎 + 开始 登录 - 登录 + 登录... 本地分支最新! - 更改: {0} + 更改:({0}） 查看更改 @@ -361,54 +361,77 @@ 已更新“{0}” - 拉取 + 在GitHub上查看拉取请求 - Updated + 已更新 - 显示评论在 + 在编辑器边缘显示PR注释 实验性功能 - 我们将在未来的版本中解锁此功能。 + 我们将在未来的版本中改变此功能。 - 查看更新 + 在解决方案中查看更新 - 解决方案中打开文件！ + 解决方案中打开文件 令牌 - 继续您的评论！ + 继续您的审阅 - 添加你的评价 + 添加你的评审 审阅者 - 评价评论 + 添加审阅意见 添加评论 - 餐叉 + Fork 正在调试 - AdtAgent 在启动期间遇到以下问题:%n\r\n任务:%t打开网络协议%n\r\n失败:%t无法创建网络协议%n\r\n错误:%t%1%n\r\n错误消息:%n%2%n\r\n%n\r\nAdtAgent 无法打开网络连接。%n\r\n%n\r\n有关详细的失败信息，请使用 TraceFlags 注册表项启用跟踪日志记录，并检查 Windows 目录的 \temp 子目录中的 AdtAgent.log。%n\r\n + 启用日志跟踪 更新注释 + + 强大的协作、代码审查、和代码管理，一切为您开源和私有项目。 + + + 这个版本库没有托管至远程。填写表单，将其发布到Github。 + + + 部分或全部版本库没有加载，请关闭对话框重试。 + + + 无效主机或不是GitHub企业服务器，请检查地址并重试。 + + + 欢迎使用 GitHub for Visual Studio! 为什么没有看这里 [training](show-training) 或[documentation](show-docs)? + +[不再显示](dont-show-again) + + + GitHub括在在Blend内部无效 + + + 在团队管理中显示【Fork】按钮 + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index f6c90053d0..86b013a13b 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -436,8 +436,16 @@ - - + + Menus.ctmenu + Designer + GitHub.VisualStudio.vsct + + + Menus.ctmenu + Designer + GitHub.VisualStudio.vsct + PreserveNewest true @@ -469,8 +477,7 @@ - Menus.ctmenu - Designer + diff --git a/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx b/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx index 018ffe5367..ab6ef94afc 100644 --- a/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx +++ b/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx @@ -121,6 +121,6 @@ GitHub.VisualStudio - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + 将GitHub的工作流带入 Visual Studio 的扩展 \ No newline at end of file From 5af33138c096ea69af984d765f341ae94dc59c55 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sat, 2 Jun 2018 12:31:28 +0800 Subject: [PATCH 03/19] add en-US --- src/GitHub.App/GitHub.App.csproj | 1 + src/GitHub.App/Resources.en-US.resx | 324 +++++++++++++ .../GitHub.InlineReviews.csproj | 1 + src/GitHub.InlineReviews/VSPackage.en-US.resx | 126 +++++ src/GitHub.StartPage/GitHub.StartPage.csproj | 1 + src/GitHub.StartPage/Resources.en-US.resx | 126 +++++ .../Controls/Octicons/OcticonPaths.en-US.resx | 120 +++++ src/GitHub.UI/GitHub.UI.csproj | 3 + src/GitHub.UI/Resources.en-US.resx | 156 +++++++ .../TestAutomation/AutomationIDs.en-US.resx | 120 +++++ .../GitHub.VisualStudio.UI.csproj | 1 + .../Resources.en-US.resx | 437 ++++++++++++++++++ .../GitHub.VisualStudio.csproj | 19 +- src/GitHub.VisualStudio/VSPackage.en-US.resx | 126 +++++ src/common/SolutionInfo.cs | 4 +- 15 files changed, 1554 insertions(+), 11 deletions(-) create mode 100644 src/GitHub.App/Resources.en-US.resx create mode 100644 src/GitHub.InlineReviews/VSPackage.en-US.resx create mode 100644 src/GitHub.StartPage/Resources.en-US.resx create mode 100644 src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx create mode 100644 src/GitHub.UI/Resources.en-US.resx create mode 100644 src/GitHub.UI/TestAutomation/AutomationIDs.en-US.resx create mode 100644 src/GitHub.VisualStudio.UI/Resources.en-US.resx create mode 100644 src/GitHub.VisualStudio/VSPackage.en-US.resx diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index 227edaed31..656432630b 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -402,6 +402,7 @@ + PublicResXFileCodeGenerator Resources.Designer.cs diff --git a/src/GitHub.App/Resources.en-US.resx b/src/GitHub.App/Resources.en-US.resx new file mode 100644 index 0000000000..8d9d9aabc6 --- /dev/null +++ b/src/GitHub.App/Resources.en-US.resx @@ -0,0 +1,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Select a containing folder for your new repository. + + + Clone a {0} Repository + + + Could not connect to github.com + + + Create a GitHub Gist + + + Create a {0} Repository + + + GistFromVisualStudio.cs + + + Please enter an Enterprise URL + + + Please enter a valid Enterprise URL + + + Not an Enterprise server. Please enter an Enterprise URL + + + (forgot your password?) + + + Make sure to use your password and not a Personal Access token to sign in. + + + Check your username and password, then try again + + + Sign in failed. + + + Connect To GitHub + + + Please enter your password + + + Pull Request for branch **{0}** created successfully at [{1}]({2}) + + + Publish repository + + + Publish repository to {0} + + + Please enter a title for the Pull Request + + + Source and target branch cannot be the same + + + Source branch doesn't exist remotely, have you pushed it? + + + No selected repository. + + + Please enter a repository path + + + Please enter a valid path + + + Path contains invalid characters + + + Path too long + + + Repository '{0}/{1}' already exists. + + + Change the repository name or select a different account and try again. + + + Exceeded private repositories quota. + + + Repository with same name already exists at this location + + + Please enter a repository name + + + Repository name must be fewer than 100 characters + + + Will be created as {0} + + + Open the two-factor authentication app on your device to view your authentication code. + + + We sent you a message via SMS with your authentication code. + + + Two-Factor authentication required + + + Enter a sign in authentication code here + + + Please enter your username or email address + + + Username or email address must not have spaces + + + Pull Requests + + + Pull Request + + + add + + + fork + + + [invalid] + + + You must pull before you can push + + + No commits to pull + + + No commits to push + + + *No description provided.* + + + Checkout {0} + + + Checkout to {0} + + + Pull from {0} branch {1} + + + Push to {0} branch {1} + + + remote + + + rename + + + The source repository is no longer available. + + + Cannot checkout as your working directory has uncommitted changes. + + + Sync {0} submodules + + + Couldn't find Git.exe on PATH. + +Please install Git for Windows from: +https://git-scm.com/download/win + + + Approved + + + Changes Requested + + + Commented + + + InProgress + + + Press Enter to navigate to Editor + + + Checkout PR branch before navigating to Editor + + + Press Enter to navigate to Editor (PR branch must be checked out) + + + Fork Repository + + + Switch Origin + + \ No newline at end of file diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index fe386c7997..f677470c6a 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -420,6 +420,7 @@ + diff --git a/src/GitHub.InlineReviews/VSPackage.en-US.resx b/src/GitHub.InlineReviews/VSPackage.en-US.resx new file mode 100644 index 0000000000..df8238a285 --- /dev/null +++ b/src/GitHub.InlineReviews/VSPackage.en-US.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + GitHub.InlineReviews + + + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + + \ No newline at end of file diff --git a/src/GitHub.StartPage/GitHub.StartPage.csproj b/src/GitHub.StartPage/GitHub.StartPage.csproj index 7326d97d8f..639ec4431f 100644 --- a/src/GitHub.StartPage/GitHub.StartPage.csproj +++ b/src/GitHub.StartPage/GitHub.StartPage.csproj @@ -187,6 +187,7 @@ + diff --git a/src/GitHub.StartPage/Resources.en-US.resx b/src/GitHub.StartPage/Resources.en-US.resx new file mode 100644 index 0000000000..c10fe53dd0 --- /dev/null +++ b/src/GitHub.StartPage/Resources.en-US.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + GitHub + + + Powerful collaboration, code review, and code management for open source and private projects. + + \ No newline at end of file diff --git a/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx b/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index bc6686dbc3..ed69e45081 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -254,17 +254,20 @@ + Designer ResXFileCodeGenerator OcticonPaths.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs Designer + PublicResXFileCodeGenerator AutomationIDs.Designer.cs diff --git a/src/GitHub.UI/Resources.en-US.resx b/src/GitHub.UI/Resources.en-US.resx new file mode 100644 index 0000000000..387aeaf04a --- /dev/null +++ b/src/GitHub.UI/Resources.en-US.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} day ago + + + {0:N0} days ago + + + {0:N0} hour ago + + + {0:N0} hours ago + + + {0:N0} minute ago + + + {0:N0} minutes ago + + + {0:N0} month ago + + + {0:N0} months ago + + + {0:N0} second ago + + + {0:N0} seconds ago + + + {0:N0} year ago + + + {0:N0} years ago + + \ No newline at end of file diff --git a/src/GitHub.UI/TestAutomation/AutomationIDs.en-US.resx b/src/GitHub.UI/TestAutomation/AutomationIDs.en-US.resx new file mode 100644 index 0000000000..d58980a38d --- /dev/null +++ b/src/GitHub.UI/TestAutomation/AutomationIDs.en-US.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index e2a5a229f7..43a21b6840 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -251,6 +251,7 @@ + PublicResXFileCodeGenerator Resources.Designer.cs diff --git a/src/GitHub.VisualStudio.UI/Resources.en-US.resx b/src/GitHub.VisualStudio.UI/Resources.en-US.resx new file mode 100644 index 0000000000..5abf49bf13 --- /dev/null +++ b/src/GitHub.VisualStudio.UI/Resources.en-US.resx @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Invalid authentication code + + + Try entering the code again or clicking the resend button to get a new authentication code. + + + Authentication code sent! + + + If you do not receive the authentication code, contact support@github.com. + + + Browse + + + Could not connect to github.com + + + Could not connect to the server. + + + Create + + + Description (Optional) + + + Open in Browser + + + Cancel + + + Gist created + + + Failed to create gist + + + by + + + Privacy + + + Help us improve by sending anonymous usage data + + + Could not copy to the clipboard. Please try again. + + + Link copied to clipboard + + + Repository created successfully. + + + Private Gist + + + File Name + + + You are not signed in to {0}, so certain git operations may fail. [Sign in now]({1}) + + + Wiki + + + Pulse + + + Pull Requests + + + Path + + + Issues + + + Graphs + + + Publish to GitHub + + + Powerful collaboration, code review, and code management for open source and private projects. + + + Connect… + + + Clone + + + Verify + + + Two-factor authentication + + + Sign up + + + Sign out + + + Send the code to your registered SMS Device again + + + Resend + + + Repository Name + + + This repository does not have a remote. Fill out the form to publish it to GitHub. + + + Publish + + + or + + + Open the two-factor authentication app on your device to view your authentication code. + + + No repositories + + + Name + + + Private Repository + + + Sign in failed. + + + Local path + + + License + + + Learn more + + + Git ignore + + + Search repositories + + + Some or all repositories may not have loaded. Close the dialog and try again. + + + An error occurred while loading repositories + + + GitHub Enterprise server address + + + The host isn't available or is not a GitHub Enterprise server. Check the address and try again. + + + Username or email + + + Password + + + Check your username and password, then try again + + + Sign in + + + (forgot your password?) + + + Please check your internet connection and try again. + + + Don’t have GitHub Enterprise? + + + Don’t have an account? + + + Title (required) + + + Description + + + Publish this repository to GitHub and get powerful collaboration, code review, and code management for open source and private projects. + + + This repository is not on GitHub + + + No repository + + + We couldn't find a git repository here. Open a git project or click "File -> Add to Source Control" in a project to get started. + + + Create an account + + + Filter branches + + + Publish to GitHub + + + Get Started + + + Sign in + + + Sign in... + + + Local branch up to date + + + Changes ({0}) + + + View Changes + + + Compare File as Default Action + + + View File + + + Open File as Default Action + + + Switch to List View + + + Switch to Tree View + + + updated {0} + + + View Pull Request on GitHub + + + Welcome to GitHub for Visual Studio! Why not take a look at our [training](show-training) or [documentation](show-docs)? + +[Don't show this again](dont-show-again) + + + Updated + + + Show PR comments on editor margin + + + Experimental features + + + These features might change in a future version + + + View Changes in Solution + + + Open File in Solution + + + Token + + + Continue your review + + + Add your review + + + Reviewers + + + Add review comment + + + Add a single comment + + + Fork + + + Debugging + + + Enable Trace Logging + + + The GitHub extension is not available inside Blend + + + Show Fork button in Team Explorer + + + Update comment + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 86b013a13b..992e603f81 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -14,6 +14,7 @@ GitHub\GitHub + en-US @@ -428,6 +429,7 @@ + true VSPackage @@ -436,16 +438,16 @@ - - Menus.ctmenu + + Menus.ctmenu Designer - GitHub.VisualStudio.vsct - - - Menus.ctmenu + GitHub.VisualStudio.vsct + + + Menus.ctmenu Designer - GitHub.VisualStudio.vsct - + GitHub.VisualStudio.vsct + PreserveNewest true @@ -477,7 +479,6 @@ - diff --git a/src/GitHub.VisualStudio/VSPackage.en-US.resx b/src/GitHub.VisualStudio/VSPackage.en-US.resx new file mode 100644 index 0000000000..018ffe5367 --- /dev/null +++ b/src/GitHub.VisualStudio/VSPackage.en-US.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + GitHub.VisualStudio + + + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + + \ No newline at end of file diff --git a/src/common/SolutionInfo.cs b/src/common/SolutionInfo.cs index 87c51686a9..1db51f6b97 100644 --- a/src/common/SolutionInfo.cs +++ b/src/common/SolutionInfo.cs @@ -9,11 +9,11 @@ [assembly: AssemblyInformationalVersion(AssemblyVersionInformation.Version)] [assembly: ComVisible(false)] [assembly: AssemblyCompany("GitHub, Inc.")] -[assembly: AssemblyCopyright("Copyright GitHub, Inc. 2014-2016")] +[assembly: AssemblyCopyright("Copyright ?GitHub, Inc. 2014-2016")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en-US")] +[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] namespace System { From 1fba9c0ebe552f5cb6bda5d987b738c092f45990 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sat, 2 Jun 2018 14:59:23 +0800 Subject: [PATCH 04/19] =?UTF-8?q?GitHub.InlineReviews=E2=80=99s=20Chinese?= =?UTF-8?q?=20is=20done!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GitHub.InlineReviews.csproj | 7 - src/GitHub.InlineReviews/VSPackage.de.resx | 120 ----------------- src/GitHub.InlineReviews/VSPackage.en-US.resx | 126 ------------------ src/GitHub.InlineReviews/VSPackage.fr.resx | 120 ----------------- src/GitHub.InlineReviews/VSPackage.it.resx | 120 ----------------- src/GitHub.InlineReviews/VSPackage.ru.resx | 120 ----------------- .../VSPackage.zh-Hans.resx | 126 ------------------ .../VSPackage.zh-Hant.resx | 120 ----------------- .../Views/CommentView.xaml | 9 +- .../Views/InlineCommentPeekView.xaml | 7 +- .../Views/PullRequestStatusView.xaml | 5 +- 11 files changed, 12 insertions(+), 868 deletions(-) delete mode 100644 src/GitHub.InlineReviews/VSPackage.de.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.en-US.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.fr.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.it.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.ru.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.zh-Hans.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.zh-Hant.resx diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index f677470c6a..ec6a0f63d9 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -419,18 +419,11 @@ - - - - true VSPackage Designer - - - diff --git a/src/GitHub.InlineReviews/VSPackage.de.resx b/src/GitHub.InlineReviews/VSPackage.de.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.de.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.en-US.resx b/src/GitHub.InlineReviews/VSPackage.en-US.resx deleted file mode 100644 index df8238a285..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.en-US.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - GitHub.InlineReviews - - - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.fr.resx b/src/GitHub.InlineReviews/VSPackage.fr.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.fr.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.it.resx b/src/GitHub.InlineReviews/VSPackage.it.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.it.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.ru.resx b/src/GitHub.InlineReviews/VSPackage.ru.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.ru.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx b/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx deleted file mode 100644 index ac832854de..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.zh-Hans.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - GitHub行内审阅 - - - 一个将GitHub工作流带入Visual Studio 的扩展 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx b/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.InlineReviews/VSPackage.zh-Hant.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.InlineReviews/Views/CommentView.xaml index fb03131906..251f6859b8 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 + @@ -198,10 +198,11 @@ - + diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml index c27c40447b..dff9888aee 100644 --- a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml +++ b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:GitHub.InlineReviews.Views" xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" + xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" mc:Ignorable="d" d:DesignHeight="200" d:DesignWidth="500"> @@ -58,7 +59,7 @@ - You must commit and push your changes to add a comment here. + @@ -71,7 +72,7 @@ - - View, Checkout or Create a Pull request + + From a2c45a016e9defd949e387225272981b1cdcb737 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sun, 3 Jun 2018 02:17:28 +0800 Subject: [PATCH 05/19] Some of the statements were extracted, and most of the interfaces are localized, but there are some anomalies. --- .../GitHub.InlineReviews.csproj | 7 +- .../InlineReviewsPackage.en-US.vsct | 60 ++ .../InlineReviewsPackage.vsct | 54 +- .../InlineReviewsPackage.zh-Hans.vsct | 60 ++ src/GitHub.StartPage/GitHub.StartPage.csproj | 1 + .../Resources.Designer.cs | 461 +++++++++---- .../Resources.en-US.resx | 75 +++ src/GitHub.VisualStudio.UI/Resources.resx | 75 +++ .../Resources.zh-Hans.resx | 103 ++- .../GitHub.VisualStudio.csproj | 17 +- src/GitHub.VisualStudio/Resources.Designer.cs | 603 ------------------ src/GitHub.VisualStudio/VSPackage.en-US.resx | 126 ---- .../VSPackage.zh-Hans.resx | 126 ---- .../Dialog/ForkRepositoryExecuteView.xaml | 9 +- .../Views/GitHubPane/LoggedOutView.xaml | 4 +- .../GitHubPane/PullRequestCreationView.xaml | 4 +- .../GitHubPane/PullRequestDetailView.xaml | 12 +- .../PullRequestReviewAuthoringView.xaml | 17 +- .../PullRequestUserReviewsView.xaml | 7 +- src/common/SolutionInfo.cs | 2 +- 20 files changed, 744 insertions(+), 1079 deletions(-) create mode 100644 src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct create mode 100644 src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct delete mode 100644 src/GitHub.VisualStudio/Resources.Designer.cs delete mode 100644 src/GitHub.VisualStudio/VSPackage.en-US.resx delete mode 100644 src/GitHub.VisualStudio/VSPackage.zh-Hans.resx diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index ec6a0f63d9..2c1c68f4b7 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -9,6 +9,7 @@ true + en-US @@ -413,10 +414,10 @@ - + Menus.ctmenu Designer - + @@ -468,6 +469,8 @@ + + PreserveNewest diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct new file mode 100644 index 0000000000..8683904657 --- /dev/null +++ b/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct index d9e99ccb84..87faf3ace6 100644 --- a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct +++ b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct @@ -22,59 +22,7 @@ - - - - - - - - - - - - + diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct new file mode 100644 index 0000000000..8b41ede800 --- /dev/null +++ b/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/GitHub.StartPage/GitHub.StartPage.csproj b/src/GitHub.StartPage/GitHub.StartPage.csproj index 639ec4431f..f5a343acc2 100644 --- a/src/GitHub.StartPage/GitHub.StartPage.csproj +++ b/src/GitHub.StartPage/GitHub.StartPage.csproj @@ -7,6 +7,7 @@ $(VisualStudioVersion) $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true + en-US diff --git a/src/GitHub.VisualStudio.UI/Resources.Designer.cs b/src/GitHub.VisualStudio.UI/Resources.Designer.cs index 03247864bb..4be7a5cb67 100644 --- a/src/GitHub.VisualStudio.UI/Resources.Designer.cs +++ b/src/GitHub.VisualStudio.UI/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace GitHub.VisualStudio.UI { /// - /// 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. + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 使用此强类型资源类，为所有资源查找 + /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to Add review comment. + /// 查找类似 Add review comment 的本地化字符串。 /// public static string AddReviewComment { get { @@ -70,7 +70,7 @@ public static string AddReviewComment { } /// - /// Looks up a localized string similar to Add a single comment. + /// 查找类似 Add a single comment 的本地化字符串。 /// public static string AddSingleComment { get { @@ -79,7 +79,7 @@ public static string AddSingleComment { } /// - /// Looks up a localized string similar to Add your review. + /// 查找类似 Add your review 的本地化字符串。 /// public static string AddYourReview { get { @@ -88,7 +88,16 @@ public static string AddYourReview { } /// - /// Looks up a localized string similar to Invalid authentication code. + /// 查找类似 Approve 的本地化字符串。 + /// + public static string Approve { + get { + return ResourceManager.GetString("Approve", resourceCulture); + } + } + + /// + /// 查找类似 Invalid authentication code 的本地化字符串。 /// public static string authenticationFailedLabelContent { get { @@ -97,7 +106,7 @@ public static string authenticationFailedLabelContent { } /// - /// Looks up a localized string similar to Try entering the code again or clicking the resend button to get a new authentication code.. + /// 查找类似 Try entering the code again or clicking the resend button to get a new authentication code. 的本地化字符串。 /// public static string authenticationFailedLabelMessage { get { @@ -106,7 +115,7 @@ public static string authenticationFailedLabelMessage { } /// - /// Looks up a localized string similar to Authentication code sent!. + /// 查找类似 Authentication code sent! 的本地化字符串。 /// public static string authenticationSentLabelContent { get { @@ -115,7 +124,7 @@ public static string authenticationSentLabelContent { } /// - /// Looks up a localized string similar to If you do not receive the authentication code, contact support@github.com.. + /// 查找类似 If you do not receive the authentication code, contact support@github.com. 的本地化字符串。 /// public static string authenticationSentLabelMessage { get { @@ -124,7 +133,16 @@ public static string authenticationSentLabelMessage { } /// - /// Looks up a localized string similar to The GitHub extension is not available inside Blend. + /// 查找类似 Back 的本地化字符串。 + /// + public static string Back { + get { + return ResourceManager.GetString("Back", resourceCulture); + } + } + + /// + /// 查找类似 The GitHub extension is not available inside Blend 的本地化字符串。 /// public static string BlendDialogText { get { @@ -133,7 +151,7 @@ public static string BlendDialogText { } /// - /// Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects.. + /// 查找类似 Powerful collaboration, code review, and code management for open source and private projects. 的本地化字符串。 /// public static string BlurbText { get { @@ -142,7 +160,7 @@ public static string BlurbText { } /// - /// Looks up a localized string similar to Browse. + /// 查找类似 Browse 的本地化字符串。 /// public static string browsePathButtonContent { get { @@ -151,7 +169,16 @@ public static string browsePathButtonContent { } /// - /// Looks up a localized string similar to Cancel. + /// 查找类似 Cancel 的本地化字符串。 + /// + public static string Cancel { + get { + return ResourceManager.GetString("Cancel", resourceCulture); + } + } + + /// + /// 查找类似 Cancel 的本地化字符串。 /// public static string CancelLink { get { @@ -160,7 +187,7 @@ public static string CancelLink { } /// - /// Looks up a localized string similar to Changes ({0}). + /// 查找类似 Changes ({0}) 的本地化字符串。 /// public static string ChangesCountFormat { get { @@ -169,7 +196,7 @@ public static string ChangesCountFormat { } /// - /// Looks up a localized string similar to Clone. + /// 查找类似 Clone 的本地化字符串。 /// public static string CloneLink { get { @@ -178,7 +205,25 @@ public static string CloneLink { } /// - /// Looks up a localized string similar to Compare File as Default Action. + /// 查找类似 Comment only 的本地化字符串。 + /// + public static string CommentOnly { + get { + return ResourceManager.GetString("CommentOnly", resourceCulture); + } + } + + /// + /// 查找类似 Comments 的本地化字符串。 + /// + public static string Comments { + get { + return ResourceManager.GetString("Comments", resourceCulture); + } + } + + /// + /// 查找类似 Compare File as Default Action 的本地化字符串。 /// public static string CompareFileAsDefaultAction { get { @@ -187,7 +232,7 @@ public static string CompareFileAsDefaultAction { } /// - /// Looks up a localized string similar to Continue your review. + /// 查找类似 Continue your review 的本地化字符串。 /// public static string ContinueYourReview { get { @@ -196,7 +241,7 @@ public static string ContinueYourReview { } /// - /// Looks up a localized string similar to Could not connect to github.com. + /// 查找类似 Could not connect to github.com 的本地化字符串。 /// public static string couldNotConnectToGitHubText { get { @@ -205,7 +250,7 @@ public static string couldNotConnectToGitHubText { } /// - /// Looks up a localized string similar to Could not connect to the server.. + /// 查找类似 Could not connect to the server. 的本地化字符串。 /// public static string couldNotConnectToTheServerText { get { @@ -214,7 +259,7 @@ public static string couldNotConnectToTheServerText { } /// - /// Looks up a localized string similar to Create an account. + /// 查找类似 Create an account 的本地化字符串。 /// public static string CreateAccountLink { get { @@ -223,7 +268,7 @@ public static string CreateAccountLink { } /// - /// Looks up a localized string similar to Create. + /// 查找类似 Create 的本地化字符串。 /// public static string CreateLink { get { @@ -232,7 +277,16 @@ public static string CreateLink { } /// - /// Looks up a localized string similar to Description. + /// 查找类似 Create pull request 的本地化字符串。 + /// + public static string CreatePullRequest { + get { + return ResourceManager.GetString("CreatePullRequest", resourceCulture); + } + } + + /// + /// 查找类似 Description 的本地化字符串。 /// public static string Description { get { @@ -241,7 +295,7 @@ public static string Description { } /// - /// Looks up a localized string similar to Description (Optional). + /// 查找类似 Description (Optional) 的本地化字符串。 /// public static string DescriptionOptional { get { @@ -250,7 +304,7 @@ public static string DescriptionOptional { } /// - /// Looks up a localized string similar to Don’t have an account? . + /// 查找类似 Don’t have an account? 的本地化字符串。 /// public static string dontHaveAnAccountText { get { @@ -259,7 +313,7 @@ public static string dontHaveAnAccountText { } /// - /// Looks up a localized string similar to Don’t have GitHub Enterprise? . + /// 查找类似 Don’t have GitHub Enterprise? 的本地化字符串。 /// public static string dontHaveGitHubEnterpriseText { get { @@ -268,7 +322,7 @@ public static string dontHaveGitHubEnterpriseText { } /// - /// Looks up a localized string similar to Please check your internet connection and try again.. + /// 查找类似 Please check your internet connection and try again. 的本地化字符串。 /// public static string dotComConnectionFailedMessageMessage { get { @@ -277,7 +331,7 @@ public static string dotComConnectionFailedMessageMessage { } /// - /// 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.. + /// 查找类似 The host isn't available or is not a GitHub Enterprise server. Check the address and try again. 的本地化字符串。 /// public static string enterpriseConnectingFailedMessage { get { @@ -286,7 +340,7 @@ public static string enterpriseConnectingFailedMessage { } /// - /// Looks up a localized string similar to GitHub Enterprise server address. + /// 查找类似 GitHub Enterprise server address 的本地化字符串。 /// public static string enterpriseUrlPromptText { get { @@ -295,7 +349,7 @@ public static string enterpriseUrlPromptText { } /// - /// Looks up a localized string similar to Could not copy to the clipboard. Please try again.. + /// 查找类似 Could not copy to the clipboard. Please try again. 的本地化字符串。 /// public static string Error_FailedToCopyToClipboard { get { @@ -304,7 +358,7 @@ public static string Error_FailedToCopyToClipboard { } /// - /// Looks up a localized string similar to File Name. + /// 查找类似 File Name 的本地化字符串。 /// public static string fileNameText { get { @@ -313,7 +367,7 @@ public static string fileNameText { } /// - /// Looks up a localized string similar to Filter branches. + /// 查找类似 Filter branches 的本地化字符串。 /// public static string filterBranchesText { get { @@ -322,7 +376,7 @@ public static string filterBranchesText { } /// - /// Looks up a localized string similar to Search repositories. + /// 查找类似 Search repositories 的本地化字符串。 /// public static string filterTextPromptText { get { @@ -331,7 +385,7 @@ public static string filterTextPromptText { } /// - /// Looks up a localized string similar to (forgot your password?). + /// 查找类似 (forgot your password?) 的本地化字符串。 /// public static string ForgotPasswordLink { get { @@ -340,7 +394,7 @@ public static string ForgotPasswordLink { } /// - /// Looks up a localized string similar to Fork. + /// 查找类似 Fork 的本地化字符串。 /// public static string ForkNavigationItemText { get { @@ -349,7 +403,25 @@ public static string ForkNavigationItemText { } /// - /// Looks up a localized string similar to Get Started. + /// 查找类似 Fork Repository 的本地化字符串。 + /// + public static string ForkRepository { + get { + return ResourceManager.GetString("ForkRepository", resourceCulture); + } + } + + /// + /// 查找类似 Fork the repository 的本地化字符串。 + /// + public static string ForkTheRepository { + get { + return ResourceManager.GetString("ForkTheRepository", resourceCulture); + } + } + + /// + /// 查找类似 Get Started 的本地化字符串。 /// public static string GetStartedText { get { @@ -358,7 +430,7 @@ public static string GetStartedText { } /// - /// Looks up a localized string similar to Gist created. + /// 查找类似 Gist created 的本地化字符串。 /// public static string gistCreatedMessage { get { @@ -367,7 +439,7 @@ public static string gistCreatedMessage { } /// - /// Looks up a localized string similar to Failed to create gist. + /// 查找类似 Failed to create gist 的本地化字符串。 /// public static string gistCreationFailedMessage { get { @@ -376,7 +448,7 @@ public static string gistCreationFailedMessage { } /// - /// Looks up a localized string similar to Connect…. + /// 查找类似 Connect… 的本地化字符串。 /// public static string GitHubInvitationSectionConnectLabel { get { @@ -385,7 +457,7 @@ public static string GitHubInvitationSectionConnectLabel { } /// - /// Looks up a localized string similar to Publish to GitHub. + /// 查找类似 Publish to GitHub 的本地化字符串。 /// public static string GitHubPublishSectionTitle { get { @@ -394,7 +466,7 @@ public static string GitHubPublishSectionTitle { } /// - /// Looks up a localized string similar to Graphs. + /// 查找类似 Graphs 的本地化字符串。 /// public static string GraphsNavigationItemText { get { @@ -403,7 +475,7 @@ public static string GraphsNavigationItemText { } /// - /// Looks up a localized string similar to Git ignore. + /// 查找类似 Git ignore 的本地化字符串。 /// public static string ignoreTemplateListText { get { @@ -412,7 +484,7 @@ public static string ignoreTemplateListText { } /// - /// Looks up a localized string similar to Issues. + /// 查找类似 Issues 的本地化字符串。 /// public static string IssuesNavigationItemText { get { @@ -421,7 +493,7 @@ public static string IssuesNavigationItemText { } /// - /// Looks up a localized string similar to Learn more. + /// 查找类似 Learn more 的本地化字符串。 /// public static string learnMoreLink { get { @@ -430,7 +502,7 @@ public static string learnMoreLink { } /// - /// Looks up a localized string similar to License. + /// 查找类似 License 的本地化字符串。 /// public static string licenseListText { get { @@ -439,7 +511,7 @@ public static string licenseListText { } /// - /// Looks up a localized string similar to Link copied to clipboard. + /// 查找类似 Link copied to clipboard 的本地化字符串。 /// public static string LinkCopiedToClipboardMessage { get { @@ -448,7 +520,7 @@ public static string LinkCopiedToClipboardMessage { } /// - /// Looks up a localized string similar to Some or all repositories may not have loaded. Close the dialog and try again.. + /// 查找类似 Some or all repositories may not have loaded. Close the dialog and try again. 的本地化字符串。 /// public static string loadingFailedMessageContent { get { @@ -457,7 +529,7 @@ public static string loadingFailedMessageContent { } /// - /// Looks up a localized string similar to An error occurred while loading repositories. + /// 查找类似 An error occurred while loading repositories 的本地化字符串。 /// public static string loadingFailedMessageMessage { get { @@ -466,7 +538,7 @@ public static string loadingFailedMessageMessage { } /// - /// Looks up a localized string similar to Local branch up to date. + /// 查找类似 Local branch up to date 的本地化字符串。 /// public static string LocalBranchUpToDate { get { @@ -475,7 +547,7 @@ public static string LocalBranchUpToDate { } /// - /// Looks up a localized string similar to Local path. + /// 查找类似 Local path 的本地化字符串。 /// public static string localPathText { get { @@ -484,7 +556,7 @@ public static string localPathText { } /// - /// Looks up a localized string similar to Check your username and password, then try again. + /// 查找类似 Check your username and password, then try again 的本地化字符串。 /// public static string LoginFailedMessage { get { @@ -493,7 +565,7 @@ public static string LoginFailedMessage { } /// - /// Looks up a localized string similar to Sign in failed.. + /// 查找类似 Sign in failed. 的本地化字符串。 /// public static string LoginFailedText { get { @@ -502,7 +574,7 @@ public static string LoginFailedText { } /// - /// Looks up a localized string similar to Sign in. + /// 查找类似 Sign in 的本地化字符串。 /// public static string LoginLink { get { @@ -511,7 +583,7 @@ public static string LoginLink { } /// - /// Looks up a localized string similar to Private Repository. + /// 查找类似 Private Repository 的本地化字符串。 /// public static string makePrivateContent { get { @@ -520,7 +592,7 @@ public static string makePrivateContent { } /// - /// Looks up a localized string similar to Private Gist. + /// 查找类似 Private Gist 的本地化字符串。 /// public static string makePrivateGist { get { @@ -529,7 +601,7 @@ public static string makePrivateGist { } /// - /// Looks up a localized string similar to Name. + /// 查找类似 Name 的本地化字符串。 /// public static string nameText { get { @@ -538,7 +610,16 @@ public static string nameText { } /// - /// Looks up a localized string similar to No repositories. + /// 查找类似 Next Comment 的本地化字符串。 + /// + public static string NextComment { + get { + return ResourceManager.GetString("NextComment", resourceCulture); + } + } + + /// + /// 查找类似 No repositories 的本地化字符串。 /// public static string noRepositoriesMessageText { get { @@ -547,7 +628,7 @@ public static string noRepositoriesMessageText { } /// - /// Looks up a localized string similar to This repository is not on GitHub. + /// 查找类似 This repository is not on GitHub 的本地化字符串。 /// public static string NotAGitHubRepository { get { @@ -556,7 +637,7 @@ public static string NotAGitHubRepository { } /// - /// Looks up a localized string similar to Publish this repository to GitHub and get powerful collaboration, code review, and code management for open source and private projects.. + /// 查找类似 Publish this repository to GitHub and get powerful collaboration, code review, and code management for open source and private projects. 的本地化字符串。 /// public static string NotAGitHubRepositoryMessage { get { @@ -565,7 +646,7 @@ public static string NotAGitHubRepositoryMessage { } /// - /// Looks up a localized string similar to No repository. + /// 查找类似 No repository 的本地化字符串。 /// public static string NotAGitRepository { get { @@ -574,7 +655,7 @@ public static string NotAGitRepository { } /// - /// Looks up a localized string similar to We couldn't find a git repository here. Open a git project or click "File -> Add to Source Control" in a project to get started.. + /// 查找类似 We couldn't find a git repository here. Open a git project or click "File -> Add to Source Control" in a project to get started. 的本地化字符串。 /// public static string NotAGitRepositoryMessage { get { @@ -583,7 +664,7 @@ public static string NotAGitRepositoryMessage { } /// - /// Looks up a localized string similar to You are not signed in to {0}, so certain git operations may fail. [Sign in now]({1}). + /// 查找类似 You are not signed in to {0}, so certain git operations may fail. [Sign in now]({1}) 的本地化字符串。 /// public static string NotLoggedInMessage { get { @@ -592,7 +673,7 @@ public static string NotLoggedInMessage { } /// - /// Looks up a localized string similar to Open File as Default Action. + /// 查找类似 Open File as Default Action 的本地化字符串。 /// public static string OpenFileAsDefaultAction { get { @@ -601,7 +682,7 @@ public static string OpenFileAsDefaultAction { } /// - /// Looks up a localized string similar to Open File in Solution. + /// 查找类似 Open File in Solution 的本地化字符串。 /// public static string OpenFileInSolution { get { @@ -610,7 +691,7 @@ public static string OpenFileInSolution { } /// - /// Looks up a localized string similar to Open in Browser. + /// 查找类似 Open in Browser 的本地化字符串。 /// public static string openInBrowser { get { @@ -619,7 +700,7 @@ public static string openInBrowser { } /// - /// Looks up a localized string similar to View Pull Request on GitHub. + /// 查找类似 View Pull Request on GitHub 的本地化字符串。 /// public static string OpenPROnGitHubToolTip { get { @@ -628,7 +709,7 @@ public static string OpenPROnGitHubToolTip { } /// - /// Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code.. + /// 查找类似 Open the two-factor authentication app on your device to view your authentication code. 的本地化字符串。 /// public static string openTwoFactorAuthAppText { get { @@ -637,7 +718,7 @@ public static string openTwoFactorAuthAppText { } /// - /// Looks up a localized string similar to Debugging. + /// 查找类似 Debugging 的本地化字符串。 /// public static string Options_DebuggingTitle { get { @@ -646,7 +727,7 @@ public static string Options_DebuggingTitle { } /// - /// Looks up a localized string similar to Show PR comments on editor margin. + /// 查找类似 Show PR comments on editor margin 的本地化字符串。 /// public static string Options_EditorCommentsLabel { get { @@ -655,7 +736,7 @@ public static string Options_EditorCommentsLabel { } /// - /// Looks up a localized string similar to Enable Trace Logging. + /// 查找类似 Enable Trace Logging 的本地化字符串。 /// public static string Options_EnableTraceLoggingText { get { @@ -664,7 +745,7 @@ public static string Options_EnableTraceLoggingText { } /// - /// Looks up a localized string similar to These features might change in a future version. + /// 查找类似 These features might change in a future version 的本地化字符串。 /// public static string Options_ExperimentalNote { get { @@ -673,7 +754,7 @@ public static string Options_ExperimentalNote { } /// - /// Looks up a localized string similar to Experimental features. + /// 查找类似 Experimental features 的本地化字符串。 /// public static string Options_ExperimentalTitle { get { @@ -682,7 +763,7 @@ public static string Options_ExperimentalTitle { } /// - /// Looks up a localized string similar to Show Fork button in Team Explorer. + /// 查找类似 Show Fork button in Team Explorer 的本地化字符串。 /// public static string Options_ForkButtonLabel { get { @@ -691,7 +772,7 @@ public static string Options_ForkButtonLabel { } /// - /// Looks up a localized string similar to Help us improve by sending anonymous usage data. + /// 查找类似 Help us improve by sending anonymous usage data 的本地化字符串。 /// public static string Options_MetricsLabel { get { @@ -700,7 +781,7 @@ public static string Options_MetricsLabel { } /// - /// Looks up a localized string similar to Privacy. + /// 查找类似 Privacy 的本地化字符串。 /// public static string Options_PrivacyTitle { get { @@ -709,7 +790,7 @@ public static string Options_PrivacyTitle { } /// - /// Looks up a localized string similar to or. + /// 查找类似 or 的本地化字符串。 /// public static string orText { get { @@ -718,7 +799,16 @@ public static string orText { } /// - /// Looks up a localized string similar to Password. + /// 查找类似 Outdated comments 的本地化字符串。 + /// + public static string OutdatedComments { + get { + return ResourceManager.GetString("OutdatedComments", resourceCulture); + } + } + + /// + /// 查找类似 Password 的本地化字符串。 /// public static string PasswordPrompt { get { @@ -727,7 +817,7 @@ public static string PasswordPrompt { } /// - /// Looks up a localized string similar to Path. + /// 查找类似 Path 的本地化字符串。 /// public static string pathText { get { @@ -736,7 +826,25 @@ public static string pathText { } /// - /// Looks up a localized string similar to by. + /// 查找类似 Pending 的本地化字符串。 + /// + public static string Pending { + get { + return ResourceManager.GetString("Pending", resourceCulture); + } + } + + /// + /// 查找类似 Previous Comment 的本地化字符串。 + /// + public static string PreviousComment { + get { + return ResourceManager.GetString("PreviousComment", resourceCulture); + } + } + + /// + /// 查找类似 by 的本地化字符串。 /// public static string prUpdatedByText { get { @@ -745,7 +853,7 @@ public static string prUpdatedByText { } /// - /// Looks up a localized string similar to Updated. + /// 查找类似 Updated 的本地化字符串。 /// public static string prUpdatedText { get { @@ -754,7 +862,7 @@ public static string prUpdatedText { } /// - /// Looks up a localized string similar to Publish. + /// 查找类似 Publish 的本地化字符串。 /// public static string publishText { get { @@ -763,7 +871,7 @@ public static string publishText { } /// - /// Looks up a localized string similar to Publish to GitHub. + /// 查找类似 Publish to GitHub 的本地化字符串。 /// public static string PublishToGitHubButton { get { @@ -772,7 +880,16 @@ public static string PublishToGitHubButton { } /// - /// Looks up a localized string similar to Pull Requests. + /// 查找类似 Pull 的本地化字符串。 + /// + public static string Pull { + get { + return ResourceManager.GetString("Pull", resourceCulture); + } + } + + /// + /// 查找类似 Pull Requests 的本地化字符串。 /// public static string PullRequestsNavigationItemText { get { @@ -781,7 +898,7 @@ public static string PullRequestsNavigationItemText { } /// - /// Looks up a localized string similar to Pulse. + /// 查找类似 Pulse 的本地化字符串。 /// public static string PulseNavigationItemText { get { @@ -790,7 +907,16 @@ public static string PulseNavigationItemText { } /// - /// Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub.. + /// 查找类似 Push 的本地化字符串。 + /// + public static string Push { + get { + return ResourceManager.GetString("Push", resourceCulture); + } + } + + /// + /// 查找类似 This repository does not have a remote. Fill out the form to publish it to GitHub. 的本地化字符串。 /// public static string RepoDoesNotHaveRemoteText { get { @@ -799,7 +925,7 @@ public static string RepoDoesNotHaveRemoteText { } /// - /// Looks up a localized string similar to Repository Name. + /// 查找类似 Repository Name 的本地化字符串。 /// public static string RepoNameText { get { @@ -808,7 +934,7 @@ public static string RepoNameText { } /// - /// Looks up a localized string similar to Repository created successfully.. + /// 查找类似 Repository created successfully. 的本地化字符串。 /// public static string RepositoryPublishedMessage { get { @@ -817,7 +943,16 @@ public static string RepositoryPublishedMessage { } /// - /// Looks up a localized string similar to Resend. + /// 查找类似 Request changes 的本地化字符串。 + /// + public static string RequestChanges { + get { + return ResourceManager.GetString("RequestChanges", resourceCulture); + } + } + + /// + /// 查找类似 Resend 的本地化字符串。 /// public static string resendCodeButtonContent { get { @@ -826,7 +961,7 @@ public static string resendCodeButtonContent { } /// - /// Looks up a localized string similar to Send the code to your registered SMS Device again. + /// 查找类似 Send the code to your registered SMS Device again 的本地化字符串。 /// public static string resendCodeButtonToolTip { get { @@ -835,7 +970,7 @@ public static string resendCodeButtonToolTip { } /// - /// Looks up a localized string similar to Reviewers. + /// 查找类似 Reviewers 的本地化字符串。 /// public static string Reviewers { get { @@ -844,7 +979,7 @@ public static string Reviewers { } /// - /// Looks up a localized string similar to Sign in.... + /// 查找类似 Sign in... 的本地化字符串。 /// public static string SignInCallToAction { get { @@ -853,7 +988,7 @@ public static string SignInCallToAction { } /// - /// Looks up a localized string similar to Sign in. + /// 查找类似 Sign in 的本地化字符串。 /// public static string SignInLink { get { @@ -862,7 +997,16 @@ public static string SignInLink { } /// - /// Looks up a localized string similar to Sign out. + /// 查找类似 Sign in to GitHub 的本地化字符串。 + /// + public static string SignInToGitHub { + get { + return ResourceManager.GetString("SignInToGitHub", resourceCulture); + } + } + + /// + /// 查找类似 Sign out 的本地化字符串。 /// public static string SignOutLink { get { @@ -871,7 +1015,7 @@ public static string SignOutLink { } /// - /// Looks up a localized string similar to Sign up. + /// 查找类似 Sign up 的本地化字符串。 /// public static string SignUpLink { get { @@ -880,7 +1024,25 @@ public static string SignUpLink { } /// - /// Looks up a localized string similar to Switch to List View. + /// 查找类似 Start a review 的本地化字符串。 + /// + public static string StartAReview { + get { + return ResourceManager.GetString("StartAReview", resourceCulture); + } + } + + /// + /// 查找类似 Submit your review for 的本地化字符串。 + /// + public static string SubmitYourReviewFor { + get { + return ResourceManager.GetString("SubmitYourReviewFor", resourceCulture); + } + } + + /// + /// 查找类似 Switch to List View 的本地化字符串。 /// public static string SwitchToListView { get { @@ -889,7 +1051,7 @@ public static string SwitchToListView { } /// - /// Looks up a localized string similar to Switch to Tree View. + /// 查找类似 Switch to Tree View 的本地化字符串。 /// public static string SwitchToTreeView { get { @@ -898,9 +1060,18 @@ public static string SwitchToTreeView { } /// - /// 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)? + /// 查找类似 Sync 的本地化字符串。 + /// + public static string Sync { + get { + return ResourceManager.GetString("Sync", resourceCulture); + } + } + + /// + /// 查找类似 Welcome to GitHub for Visual Studio! Why not take a look at our [training](show-training) or [documentation](show-docs)? /// - ///[Don't show this again](dont-show-again). + ///[Don't show this again](dont-show-again) 的本地化字符串。 /// public static string TeamExplorerWelcomeMessage { get { @@ -909,7 +1080,7 @@ public static string TeamExplorerWelcomeMessage { } /// - /// Looks up a localized string similar to Title (required). + /// 查找类似 Title (required) 的本地化字符串。 /// public static string TitleRequired { get { @@ -918,7 +1089,7 @@ public static string TitleRequired { } /// - /// Looks up a localized string similar to Token. + /// 查找类似 Token 的本地化字符串。 /// public static string TokenPrompt { get { @@ -927,7 +1098,16 @@ public static string TokenPrompt { } /// - /// Looks up a localized string similar to Two-factor authentication. + /// 查找类似 to point to 的本地化字符串。 + /// + public static string ToPointTo { + get { + return ResourceManager.GetString("ToPointTo", resourceCulture); + } + } + + /// + /// 查找类似 Two-factor authentication 的本地化字符串。 /// public static string twoFactorAuthText { get { @@ -936,7 +1116,7 @@ public static string twoFactorAuthText { } /// - /// Looks up a localized string similar to Update comment. + /// 查找类似 Update comment 的本地化字符串。 /// public static string UpdateComment { get { @@ -945,7 +1125,7 @@ public static string UpdateComment { } /// - /// Looks up a localized string similar to updated {0}. + /// 查找类似 updated {0} 的本地化字符串。 /// public static string UpdatedFormat { get { @@ -954,7 +1134,16 @@ public static string UpdatedFormat { } /// - /// Looks up a localized string similar to Username or email. + /// 查找类似 Update your local repository's 的本地化字符串。 + /// + public static string UpdateYourLocalRepositoryS { + get { + return ResourceManager.GetString("UpdateYourLocalRepositoryS", resourceCulture); + } + } + + /// + /// 查找类似 Username or email 的本地化字符串。 /// public static string UserNameOrEmailPromptText { get { @@ -963,7 +1152,7 @@ public static string UserNameOrEmailPromptText { } /// - /// Looks up a localized string similar to Verify. + /// 查找类似 Verify 的本地化字符串。 /// public static string verifyText { get { @@ -972,7 +1161,7 @@ public static string verifyText { } /// - /// Looks up a localized string similar to View Changes. + /// 查找类似 View Changes 的本地化字符串。 /// public static string ViewChanges { get { @@ -981,7 +1170,7 @@ public static string ViewChanges { } /// - /// Looks up a localized string similar to View Changes in Solution. + /// 查找类似 View Changes in Solution 的本地化字符串。 /// public static string ViewChangesInSolution { get { @@ -990,7 +1179,16 @@ public static string ViewChangesInSolution { } /// - /// Looks up a localized string similar to View File. + /// 查找类似 View, Checkout or Create a Pull request 的本地化字符串。 + /// + public static string ViewCheckoutOrCreateAPullRequest { + get { + return ResourceManager.GetString("ViewCheckoutOrCreateAPullRequest", resourceCulture); + } + } + + /// + /// 查找类似 View File 的本地化字符串。 /// public static string ViewFile { get { @@ -999,12 +1197,39 @@ public static string ViewFile { } /// - /// Looks up a localized string similar to Wiki. + /// 查找类似 Wiki 的本地化字符串。 /// public static string WikiNavigationItemText { get { return ResourceManager.GetString("WikiNavigationItemText", resourceCulture); } } + + /// + /// 查找类似 wrote 的本地化字符串。 + /// + public static string Wrote { + get { + return ResourceManager.GetString("Wrote", resourceCulture); + } + } + + /// + /// 查找类似 You must commit and push your changes to add a comment here. 的本地化字符串。 + /// + public static string YouMustCommitAndPushYourChangesToAddACommentHere { + get { + return ResourceManager.GetString("YouMustCommitAndPushYourChangesToAddACommentHere", resourceCulture); + } + } + + /// + /// 查找类似 Your review summary 的本地化字符串。 + /// + public static string YourReviewSummary { + get { + return ResourceManager.GetString("YourReviewSummary", resourceCulture); + } + } } } diff --git a/src/GitHub.VisualStudio.UI/Resources.en-US.resx b/src/GitHub.VisualStudio.UI/Resources.en-US.resx index 5abf49bf13..4240b03706 100644 --- a/src/GitHub.VisualStudio.UI/Resources.en-US.resx +++ b/src/GitHub.VisualStudio.UI/Resources.en-US.resx @@ -434,4 +434,79 @@ 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 + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.resx b/src/GitHub.VisualStudio.UI/Resources.resx index 5abf49bf13..4240b03706 100644 --- a/src/GitHub.VisualStudio.UI/Resources.resx +++ b/src/GitHub.VisualStudio.UI/Resources.resx @@ -434,4 +434,79 @@ 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 + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx index 02f90c8069..7fa166fa7e 100644 --- a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx +++ b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx @@ -190,7 +190,7 @@ 维基 - 脉冲 + Pulse 拉取请求 @@ -229,7 +229,7 @@ 重新发送 - 版本库名称 + 存储库名称 发布 @@ -241,13 +241,13 @@ 在你的手机上打开双重身份验证App查看验证码。 - 没有版本库 + 没有存储库 名称 - 私有版本库 + 私有存储库 登录失败。 @@ -265,10 +265,10 @@ Git忽略 - 搜索版本库 + 搜索存储库 - 加载版本库时发送意外。 + 加载存储库时发送意外。 GitHub企业服务器地址 @@ -304,13 +304,13 @@ 描述 - 将此版本库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 + 将此存储库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 - 此版本库未托管至Github + 此存储库未托管至Github - 没有版本库 + 没有存储库 我们在这里找不到 git 存储库。打开一个 git 项目或单击项目中的 "文件-&gt;&gt; 添加到源代码管理" 以开始.! @@ -385,16 +385,16 @@ 令牌 - 继续您的审阅 + 继续您的复审 - 添加你的评审 + 添加你的复审 审阅者 - 添加审阅意见 + 添加复审意见 添加评论 @@ -415,10 +415,10 @@ 强大的协作、代码审查、和代码管理，一切为您开源和私有项目。 - 这个版本库没有托管至远程。填写表单，将其发布到Github。 + 这个存储库没有托管至远程。填写表单，将其发布到Github。 - 部分或全部版本库没有加载，请关闭对话框重试。 + 部分或全部存储库没有加载，请关闭对话框重试。 无效主机或不是GitHub企业服务器，请检查地址并重试。 @@ -434,4 +434,79 @@ 在团队管理中显示【Fork】按钮 + + 取消 + + + 挂起 + + + 开始审阅 + + + 您必须提交和推送更改, 才能在此添加注释。 + + + 上一个评论 + + + 下一个评论 + + + 查看、签出或创建拉取请求 + + + 返回 + + + Fork存储库 + + + Fork此存储库 + + + 更新本地存储库的 + + + 要指向 + + + 创建拉取请求 + + + 登录GitHub + + + 拉取 + + + 推送 + + + 同步 + + + 已写 + + + 提交你的复审 + + + 你的复审概要 + + + 仅批注 + + + 批准 + + + 请求更改 + + + 批注 + + + 过期批注 + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 992e603f81..d35ef8b173 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -14,7 +14,7 @@ GitHub\GitHub - en-US + en-US @@ -429,23 +429,22 @@ - true VSPackage Designer - + + Designer + Menus.ctmenu - Designer GitHub.VisualStudio.vsct Menus.ctmenu - Designer GitHub.VisualStudio.vsct @@ -477,10 +476,6 @@ - - - - Properties\CodeAnalysisDictionary.xml @@ -780,8 +775,8 @@ {d1dfbb0c-b570-4302-8f1e-2e3a19c41961} GitHub.VisualStudio.UI True - BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; - DebugSymbolsProjectOutputGroup; + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bDebugSymbolsProjectOutputGroup%3bBuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b 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/VSPackage.en-US.resx b/src/GitHub.VisualStudio/VSPackage.en-US.resx deleted file mode 100644 index 018ffe5367..0000000000 --- a/src/GitHub.VisualStudio/VSPackage.en-US.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - GitHub.VisualStudio - - - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx b/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx deleted file mode 100644 index ab6ef94afc..0000000000 --- a/src/GitHub.VisualStudio/VSPackage.zh-Hans.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - GitHub.VisualStudio - - - 将GitHub的工作流带入 Visual Studio 的扩展 - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml b/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml index 4626924522..6767d0f1d8 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" @@ -55,7 +56,7 @@ - Fork the repository + @@ -66,7 +67,7 @@ - Update your local repository's origin to point to + origin @@ -93,8 +94,8 @@ Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}" HorizontalAlignment="Left" /> - - + + diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml index a3582715e8..dd40378b7c 100644 --- a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml +++ b/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml @@ -32,12 +32,12 @@ Foreground="{DynamicResource GitHubVsWindowText}" HorizontalAlignment="Center" FontSize="16" - Content="Sign in to GitHub" /> + Content="{x:Static prop:Resources.SignInToGitHub}" /> + Text="{x:Static prop:Resources.BlurbText}" /> + + + + - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct index 3b9cdfb18e..44d2127aa7 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct @@ -24,264 +24,7 @@ - - - - - WindowToolBar - Window Toolbar - - - - - - - GitHub - GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WindowToolBar - Window Toolbar - - - - - - - GitHub - GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct index 4d56dfd2da..8c8cb5233e 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct @@ -21,8 +21,46 @@ - + + + + WindowToolBar + Window Toolbar + + + + + + GitHub + GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66,6 +104,30 @@ + + + + - \ No newline at end of file From dcac9e560423391de7c97f2e5b327a8eb1a6d01b Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Wed, 1 Aug 2018 15:10:00 +0800 Subject: [PATCH 16/19] fix OpenFromClipboardCommandTests.cs --- .../Commands/OpenFromClipboardCommandTests.cs | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs index cd1f36b60e..03b7a48904 100644 --- a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs @@ -4,6 +4,7 @@ using GitHub.Primitives; using GitHub.Services; using GitHub.VisualStudio.Commands; +using GitHub.VisualStudio.UI; using Microsoft.VisualStudio; using NSubstitute; using NUnit.Framework; @@ -21,7 +22,7 @@ public async Task NothingInClipboard() await target.Execute(null); - vsServices.Received(1).ShowMessageBoxInfo(OpenFromClipboardCommand.NoGitHubUrlMessage); + vsServices.Received(1).ShowMessageBoxInfo(Resources.NoGitHubUrlMessage); } [Test] @@ -34,14 +35,14 @@ public async Task NoLocalRepository() await target.Execute(null); - vsServices.Received(1).ShowMessageBoxInfo(OpenFromClipboardCommand.NoActiveRepositoryMessage); + vsServices.Received(1).ShowMessageBoxInfo(Resources.NoActiveRepositoryMessage); } [Test] public async Task UnknownLinkType() { var context = new GitHubContext { LinkType = LinkType.Unknown }; - var expectMessage = string.Format(OpenFromClipboardCommand.UnknownLinkTypeMessage, context.Url); + var expectMessage = string.Format(Resources.UnknownLinkTypeMessage, context.Url); var activeRepositoryDir = "activeRepositoryDir"; var vsServices = Substitute.For(); var target = CreateOpenFromClipboardCommand(vsServices: vsServices, contextFromClipboard: context, repositoryDir: activeRepositoryDir); @@ -50,8 +51,12 @@ public async Task UnknownLinkType() vsServices.Received(1).ShowMessageBoxInfo(expectMessage); } + [Test] + public async void DifferentLocalRepository_DifferentRepositoryMessage() + { + await DifferentLocalRepository("targetRepositoryName", "activeRepositoryName", Resources.DifferentRepositoryMessage); + } - [TestCase("targetRepositoryName", "activeRepositoryName", OpenFromClipboardCommand.DifferentRepositoryMessage)] [TestCase("SameRepositoryName", "SameRepositoryName", null)] [TestCase("same_repository_name", "SAME_REPOSITORY_NAME", null)] public async Task DifferentLocalRepository(string targetRepositoryName, string activeRepositoryName, string expectMessage) @@ -75,9 +80,22 @@ public async Task DifferentLocalRepository(string targetRepositoryName, string a } } - [TestCase("TargetOwner", "CurrentOwner", OpenFromClipboardCommand.NoResolveDifferentOwnerMessage)] - [TestCase("SameOwner", "SameOwner", OpenFromClipboardCommand.NoResolveSameOwnerMessage)] - [TestCase("sameowner", "SAMEOWNER", OpenFromClipboardCommand.NoResolveSameOwnerMessage)] + + [Test] + public async void CouldNotResolve_NoResolveDifferentOwnerMessage() + { + await CouldNotResolve("TargetOwner", "CurrentOwner", Resources.NoResolveDifferentOwnerMessage); + } + [Test] + public async void CouldNotResolve_NoResolveSameOwnerMessage_SameOwner_SameOwner() + { + await CouldNotResolve("SameOwner", "SameOwner", Resources.NoResolveSameOwnerMessage); + } + [Test] + public async void CouldNotResolve_NoResolveSameOwnerMessage_sameowner_SAMEOWNER() + { + await CouldNotResolve("sameowner", "SAMEOWNER", Resources.NoResolveSameOwnerMessage); + } public async Task CouldNotResolve(string targetOwner, string currentOwner, string expectMessage) { var repositoryDir = "repositoryDir"; @@ -126,9 +144,12 @@ public async Task NoChangesInWorkingDirectory() vsServices.DidNotReceiveWithAnyArgs().ShowMessageBoxInfo(null); gitHubContextService.Received(1).TryOpenFile(repositoryDir, context); } - + [Test] + public async void HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage() + { + await HasChangesInWorkingDirectory(false, Resources.ChangesInWorkingDirectoryMessage, 1, 1); + } [TestCase(true, null, 1, 0)] - [TestCase(false, OpenFromClipboardCommand.ChangesInWorkingDirectoryMessage, 1, 1)] public async Task HasChangesInWorkingDirectory(bool annotateFileSupported, string message, int receivedTryAnnotateFile, int receivedTryOpenFile) { From cc322e6cc17dca261d2db01b2d0d49b294f28bba Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Wed, 1 Aug 2018 15:17:21 +0800 Subject: [PATCH 17/19] fix OpenFromClipboardCommandTests Async test method must have non-void return type --- .../Commands/OpenFromClipboardCommandTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs index 03b7a48904..f018319245 100644 --- a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs @@ -52,7 +52,7 @@ public async Task UnknownLinkType() vsServices.Received(1).ShowMessageBoxInfo(expectMessage); } [Test] - public async void DifferentLocalRepository_DifferentRepositoryMessage() + public async Task DifferentLocalRepository_DifferentRepositoryMessage() { await DifferentLocalRepository("targetRepositoryName", "activeRepositoryName", Resources.DifferentRepositoryMessage); } @@ -82,17 +82,17 @@ public async Task DifferentLocalRepository(string targetRepositoryName, string a [Test] - public async void CouldNotResolve_NoResolveDifferentOwnerMessage() + public async Task CouldNotResolve_NoResolveDifferentOwnerMessage() { await CouldNotResolve("TargetOwner", "CurrentOwner", Resources.NoResolveDifferentOwnerMessage); } [Test] - public async void CouldNotResolve_NoResolveSameOwnerMessage_SameOwner_SameOwner() + public async Task CouldNotResolve_NoResolveSameOwnerMessage_SameOwner_SameOwner() { await CouldNotResolve("SameOwner", "SameOwner", Resources.NoResolveSameOwnerMessage); } [Test] - public async void CouldNotResolve_NoResolveSameOwnerMessage_sameowner_SAMEOWNER() + public async Task CouldNotResolve_NoResolveSameOwnerMessage_sameowner_SAMEOWNER() { await CouldNotResolve("sameowner", "SAMEOWNER", Resources.NoResolveSameOwnerMessage); } @@ -145,7 +145,7 @@ public async Task NoChangesInWorkingDirectory() gitHubContextService.Received(1).TryOpenFile(repositoryDir, context); } [Test] - public async void HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage() + public async Task HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage() { await HasChangesInWorkingDirectory(false, Resources.ChangesInWorkingDirectoryMessage, 1, 1); } From 078e9785137ba2e7219d16fa7cf85a6b83cd7fdf Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Fri, 10 Aug 2018 10:21:21 +0800 Subject: [PATCH 18/19] Merged with new content --- src/GitHub.App/Resources.Designer.cs | 15 +++++----- src/GitHub.App/Resources.en-US.resx | 6 ++++ src/GitHub.App/Resources.zh-Hans.resx | 6 ++++ .../Resources.en-US.resx | 30 +++++++++++++++++++ .../Resources.zh-Hans.resx | 30 +++++++++++++++++++ 5 files changed, 80 insertions(+), 7 deletions(-) diff --git a/src/GitHub.App/Resources.Designer.cs b/src/GitHub.App/Resources.Designer.cs index ac56bb6e19..5c2211dd12 100644 --- a/src/GitHub.App/Resources.Designer.cs +++ b/src/GitHub.App/Resources.Designer.cs @@ -13,11 +13,12 @@ namespace GitHub.App { /// + /// 一个强类型的资源类，用于查找本地化的字符串等。 /// - // 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. + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -87,7 +88,7 @@ public static string BrowseForDirectory { } /// - /// Looks up a localized string similar to Are you sure you want to cancel this review? You will lose all your pending comments.. + /// 查找类似 Are you sure you want to cancel this review? You will lose all your pending comments. 的本地化字符串。 /// public static string CancelPendingReviewConfirmation { get { @@ -96,7 +97,7 @@ public static string CancelPendingReviewConfirmation { } /// - /// Looks up a localized string similar to Cancel Review. + /// 查找类似 Cancel Review 的本地化字符串。 /// public static string CancelPendingReviewConfirmationCaption { get { @@ -105,7 +106,7 @@ public static string CancelPendingReviewConfirmationCaption { } /// - /// Looks up a localized string similar to Changes Requested. + /// 查找类似 Changes Requested 的本地化字符串。 /// public static string ChangesRequested { get { diff --git a/src/GitHub.App/Resources.en-US.resx b/src/GitHub.App/Resources.en-US.resx index 8d9d9aabc6..124f512308 100644 --- a/src/GitHub.App/Resources.en-US.resx +++ b/src/GitHub.App/Resources.en-US.resx @@ -321,4 +321,10 @@ https://git-scm.com/download/win Switch Origin + + Are you sure you want to cancel this review? You will lose all your pending comments. + + + Cancel Review + \ No newline at end of file diff --git a/src/GitHub.App/Resources.zh-Hans.resx b/src/GitHub.App/Resources.zh-Hans.resx index 3b2d7cc33e..4fedabe2d8 100644 --- a/src/GitHub.App/Resources.zh-Hans.resx +++ b/src/GitHub.App/Resources.zh-Hans.resx @@ -320,4 +320,10 @@ 原始开关 + + 您确定要取消此评审吗？您将丢失所有待处理的评论。 + + + 取消评审 + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.en-US.resx b/src/GitHub.VisualStudio.UI/Resources.en-US.resx index dd407465ec..6a9d93e249 100644 --- a/src/GitHub.VisualStudio.UI/Resources.en-US.resx +++ b/src/GitHub.VisualStudio.UI/Resources.en-US.resx @@ -545,4 +545,34 @@ create a pull request + + Are you sure you want to delete this comment? + + + Delete Comment + + + 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-Hans.resx b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx index aa43c5d918..7d638d095f 100644 --- a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx +++ b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx @@ -545,4 +545,34 @@ 创建拉取请求 + + 在“{0}”打开存储库? + + + 目标URL与当前存储库拥有者不同。 + + + 没有活动的存储库可以导航 + + + 自创建固定链接以来，此文件已更改！ + + + 请打开存储库“{0}”，然后重试！ + + + 无法从“{0}”打开。目前仅支持链接到存储库文件的URL。 + + + 无法在剪贴板中找到GitHub网址！ + + + 无法在当前存储库中找到目标URL。在进行提取后再试一次。 + + + 删除注释 + + + 您确定要删除此注释吗? + \ No newline at end of file From acc46cfaf437f17cbac135a178c516efa23356f9 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sat, 11 Aug 2018 00:23:11 +0800 Subject: [PATCH 19/19] modify for review --- src/GitHub.InlineReviews/Views/CommentView.xaml | 4 ++-- .../Views/Dialog/ForkRepositoryExecuteView.xaml | 2 +- .../Commands/OpenFromClipboardCommandTests.cs | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.InlineReviews/Views/CommentView.xaml index 7f4cf8c88e..028df5d7ff 100644 --- a/src/GitHub.InlineReviews/Views/CommentView.xaml +++ b/src/GitHub.InlineReviews/Views/CommentView.xaml @@ -67,8 +67,8 @@ CornerRadius="3" Padding="2 1" Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}"> - - + + - Fork the repository + diff --git a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs index f018319245..a5d5ff6f2b 100644 --- a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs @@ -46,13 +46,12 @@ public async Task UnknownLinkType() var activeRepositoryDir = "activeRepositoryDir"; var vsServices = Substitute.For(); var target = CreateOpenFromClipboardCommand(vsServices: vsServices, contextFromClipboard: context, repositoryDir: activeRepositoryDir); - await target.Execute(null); - vsServices.Received(1).ShowMessageBoxInfo(expectMessage); } + [Test] - public async Task DifferentLocalRepository_DifferentRepositoryMessage() + public async Task DifferentLocalRepository_DifferentRepositoryMessage() { await DifferentLocalRepository("targetRepositoryName", "activeRepositoryName", Resources.DifferentRepositoryMessage); } @@ -86,16 +85,19 @@ public async Task CouldNotResolve_NoResolveDifferentOwnerMessage() { await CouldNotResolve("TargetOwner", "CurrentOwner", Resources.NoResolveDifferentOwnerMessage); } + [Test] public async Task CouldNotResolve_NoResolveSameOwnerMessage_SameOwner_SameOwner() { await CouldNotResolve("SameOwner", "SameOwner", Resources.NoResolveSameOwnerMessage); } + [Test] public async Task CouldNotResolve_NoResolveSameOwnerMessage_sameowner_SAMEOWNER() { await CouldNotResolve("sameowner", "SAMEOWNER", Resources.NoResolveSameOwnerMessage); } + public async Task CouldNotResolve(string targetOwner, string currentOwner, string expectMessage) { var repositoryDir = "repositoryDir"; @@ -147,8 +149,9 @@ public async Task NoChangesInWorkingDirectory() [Test] public async Task HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage() { - await HasChangesInWorkingDirectory(false, Resources.ChangesInWorkingDirectoryMessage, 1, 1); + await HasChangesInWorkingDirectory(false, Resources.ChangesInWorkingDirectoryMessage, 1, 1); } + [TestCase(true, null, 1, 0)] public async Task HasChangesInWorkingDirectory(bool annotateFileSupported, string message, int receivedTryAnnotateFile, int receivedTryOpenFile)