From c8fcd9f99303b2d7382cfb3b2815daa12c82dff7 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 22 Aug 2018 18:00:53 +0200 Subject: [PATCH 1/2] Revert "Merge pull request #1714 from maikebing/localization" This reverts commit 3b501b0deed39966ee53a4c0a5dede9eef38343f, reversing changes made to d3641f4a633ef63e6c4cf6ef052383ed82964046. --- scripts/modules.ps1 | 3 - src/GitHub.App/GitHub.App.csproj | 3 - src/GitHub.App/Resources.Designer.cs | 164 ++--- src/GitHub.App/Resources.en-US.resx | 330 --------- src/GitHub.App/Resources.zh-Hans.resx | 329 --------- .../GitHub.InlineReviews.csproj | 35 +- .../InlineReviewsPackage.en-US.vsct | 60 -- .../InlineReviewsPackage.vsct | 54 +- .../InlineReviewsPackage.zh-Hans.vsct | 60 -- .../Properties/AssemblyInfo.cs | 2 - src/GitHub.InlineReviews/VSPackage.en-US.resx | 126 ---- .../VSPackage.zh-Hans.resx | 126 ---- .../Views/CommentView.xaml | 11 +- .../Views/InlineCommentPeekView.xaml | 7 +- .../Views/PullRequestStatusView.xaml | 5 +- src/GitHub.StartPage/GitHub.StartPage.csproj | 7 - .../Properties/AssemblyInfo.cs | 2 - src/GitHub.StartPage/Resources.en-US.resx | 126 ---- src/GitHub.StartPage/Resources.zh-Hans.resx | 126 ---- .../Properties/AssemblyInfo.cs | 3 +- .../Controls/Octicons/OcticonPaths.en-US.resx | 120 ---- src/GitHub.UI/GitHub.UI.csproj | 9 - src/GitHub.UI/Properties/AssemblyInfo.cs | 3 +- src/GitHub.UI/Resources.en-US.resx | 156 ----- src/GitHub.UI/Resources.zh-Hans.resx | 156 ----- .../GitHub.VisualStudio.UI.csproj | 7 - .../Properties/AssemblyInfo.cs | 3 +- .../Resources.Designer.cs | 638 ++++-------------- .../Resources.en-US.resx | 578 ---------------- src/GitHub.VisualStudio.UI/Resources.resx | 132 ---- .../Resources.zh-Hans.resx | 578 ---------------- .../Commands/OpenFromClipboardCommand.cs | 23 +- .../Commands/OpenFromUrlCommand.cs | 3 +- .../GitHub.VisualStudio.csproj | 69 +- .../GitHub.VisualStudio.en-US.vsct | 271 -------- .../GitHub.VisualStudio.vsct | 255 ++++++- .../GitHub.VisualStudio.zh-Hans.vsct | 271 -------- .../Properties/AssemblyInfo.cs | 3 +- src/GitHub.VisualStudio/Resources.Designer.cs | 603 +++++++++++++++++ src/GitHub.VisualStudio/VSPackage.en-US.resx | 126 ---- .../VSPackage.zh-Hans.resx | 126 ---- .../Dialog/ForkRepositoryExecuteView.xaml | 10 +- .../Views/Dialog/LoginCredentialsView.xaml | 6 +- .../Views/GitHubPane/LoggedOutView.xaml | 4 +- .../GitHubPane/PullRequestCreationView.xaml | 4 +- .../GitHubPane/PullRequestDetailView.xaml | 12 +- .../Views/GitHubPane/PullRequestListView.xaml | 22 +- .../PullRequestReviewAuthoringView.xaml | 17 +- .../PullRequestUserReviewsView.xaml | 7 +- src/common/SolutionInfo.cs | 4 +- .../Commands/OpenFromClipboardCommandTests.cs | 44 +- 51 files changed, 1243 insertions(+), 4596 deletions(-) delete mode 100644 src/GitHub.App/Resources.en-US.resx delete mode 100644 src/GitHub.App/Resources.zh-Hans.resx delete mode 100644 src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct delete mode 100644 src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct delete mode 100644 src/GitHub.InlineReviews/VSPackage.en-US.resx delete mode 100644 src/GitHub.InlineReviews/VSPackage.zh-Hans.resx delete mode 100644 src/GitHub.StartPage/Resources.en-US.resx delete mode 100644 src/GitHub.StartPage/Resources.zh-Hans.resx delete mode 100644 src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx delete mode 100644 src/GitHub.UI/Resources.en-US.resx delete mode 100644 src/GitHub.UI/Resources.zh-Hans.resx delete mode 100644 src/GitHub.VisualStudio.UI/Resources.en-US.resx delete mode 100644 src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx delete mode 100644 src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct delete mode 100644 src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct create 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/scripts/modules.ps1 b/scripts/modules.ps1 index 162ea9f833..f0430ddc49 100644 --- a/scripts/modules.ps1 +++ b/scripts/modules.ps1 @@ -104,9 +104,6 @@ New-Module -ScriptBlock { } elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe") { $msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" - } - elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe") { - $msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" } else { Die("No suitable msbuild.exe found.") diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index 36a602790d..a06b5e60ed 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -425,9 +425,6 @@ Resources.Designer.cs Designer - - Resources.resx - diff --git a/src/GitHub.App/Resources.Designer.cs b/src/GitHub.App/Resources.Designer.cs index 5c2211dd12..67ebbf80fb 100644 --- a/src/GitHub.App/Resources.Designer.cs +++ b/src/GitHub.App/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace GitHub.App { /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 + // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// 返回此类使用的缓存的 ResourceManager 实例。 + /// 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 { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 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 { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// 查找类似 add 的本地化字符串。 + /// Looks up a localized string similar to add. /// public static string AddedFileStatus { get { @@ -70,7 +70,7 @@ public static string AddedFileStatus { } /// - /// 查找类似 Approved 的本地化字符串。 + /// Looks up a localized string similar to Approved. /// public static string Approved { get { @@ -79,7 +79,7 @@ public static string Approved { } /// - /// 查找类似 Select a containing folder for your new repository. 的本地化字符串。 + /// Looks up a localized string similar to Select a containing folder for your new repository.. /// public static string BrowseForDirectory { get { @@ -88,7 +88,7 @@ public static string BrowseForDirectory { } /// - /// 查找类似 Are you sure you want to cancel this review? You will lose all your pending comments. 的本地化字符串。 + /// Looks up a localized string similar to Are you sure you want to cancel this review? You will lose all your pending comments.. /// public static string CancelPendingReviewConfirmation { get { @@ -97,7 +97,7 @@ public static string CancelPendingReviewConfirmation { } /// - /// 查找类似 Cancel Review 的本地化字符串。 + /// Looks up a localized string similar to Cancel Review. /// public static string CancelPendingReviewConfirmationCaption { get { @@ -106,7 +106,7 @@ public static string CancelPendingReviewConfirmationCaption { } /// - /// 查找类似 Changes Requested 的本地化字符串。 + /// Looks up a localized string similar to Changes Requested. /// public static string ChangesRequested { get { @@ -115,7 +115,7 @@ public static string ChangesRequested { } /// - /// 查找类似 Clone a {0} Repository 的本地化字符串。 + /// Looks up a localized string similar to Clone a {0} Repository. /// public static string CloneTitle { get { @@ -124,7 +124,7 @@ public static string CloneTitle { } /// - /// 查找类似 Commented 的本地化字符串。 + /// Looks up a localized string similar to Commented. /// public static string Commented { get { @@ -133,7 +133,7 @@ public static string Commented { } /// - /// 查找类似 Could not connect to github.com 的本地化字符串。 + /// Looks up a localized string similar to Could not connect to github.com. /// public static string CouldNotConnectToGitHub { get { @@ -142,10 +142,10 @@ public static string CouldNotConnectToGitHub { } /// - /// 查找类似 Couldn't find Git.exe on PATH. + /// Looks up a localized string similar to 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 { @@ -154,7 +154,7 @@ public static string CouldntFindGitOnPath { } /// - /// 查找类似 Create a GitHub Gist 的本地化字符串。 + /// Looks up a localized string similar to Create a GitHub Gist. /// public static string CreateGistTitle { get { @@ -163,7 +163,7 @@ public static string CreateGistTitle { } /// - /// 查找类似 Create a {0} Repository 的本地化字符串。 + /// Looks up a localized string similar to Create a {0} Repository. /// public static string CreateTitle { get { @@ -172,7 +172,7 @@ public static string CreateTitle { } /// - /// 查找类似 GistFromVisualStudio.cs 的本地化字符串。 + /// Looks up a localized string similar to GistFromVisualStudio.cs. /// public static string DefaultGistFileName { get { @@ -181,7 +181,7 @@ public static string DefaultGistFileName { } /// - /// 查找类似 Please enter an Enterprise URL 的本地化字符串。 + /// Looks up a localized string similar to Please enter an Enterprise URL. /// public static string EnterpriseUrlValidatorEmpty { get { @@ -190,7 +190,7 @@ public static string EnterpriseUrlValidatorEmpty { } /// - /// 查找类似 Please enter a valid Enterprise URL 的本地化字符串。 + /// Looks up a localized string similar to Please enter a valid Enterprise URL. /// public static string EnterpriseUrlValidatorInvalid { get { @@ -199,7 +199,7 @@ public static string EnterpriseUrlValidatorInvalid { } /// - /// 查找类似 Not an Enterprise server. Please enter an Enterprise URL 的本地化字符串。 + /// Looks up a localized string similar to Not an Enterprise server. Please enter an Enterprise URL. /// public static string EnterpriseUrlValidatorNotAGitHubHost { get { @@ -208,7 +208,7 @@ public static string EnterpriseUrlValidatorNotAGitHubHost { } /// - /// 查找类似 (forgot your password?) 的本地化字符串。 + /// Looks up a localized string similar to (forgot your password?). /// public static string ForgotPasswordLink { get { @@ -217,7 +217,7 @@ public static string ForgotPasswordLink { } /// - /// 查找类似 fork 的本地化字符串。 + /// Looks up a localized string similar to fork. /// public static string Fork { get { @@ -226,7 +226,7 @@ public static string Fork { } /// - /// 查找类似 Fork Repository 的本地化字符串。 + /// Looks up a localized string similar to Fork Repository. /// public static string ForkRepositoryTitle { get { @@ -235,7 +235,7 @@ public static string ForkRepositoryTitle { } /// - /// 查找类似 InProgress 的本地化字符串。 + /// Looks up a localized string similar to InProgress. /// public static string InProgress { get { @@ -244,7 +244,7 @@ public static string InProgress { } /// - /// 查找类似 [invalid] 的本地化字符串。 + /// Looks up a localized string similar to [invalid]. /// public static string InvalidBranchName { get { @@ -253,7 +253,7 @@ public static string InvalidBranchName { } /// - /// 查找类似 Make sure to use your password and not a Personal Access token to sign in. 的本地化字符串。 + /// Looks up a localized string similar to Make sure to use your password and not a Personal Access token to sign in.. /// public static string LoginFailedForbiddenMessage { get { @@ -262,7 +262,7 @@ public static string LoginFailedForbiddenMessage { } /// - /// 查找类似 Check your username and password, then try again 的本地化字符串。 + /// Looks up a localized string similar to Check your username and password, then try again. /// public static string LoginFailedMessage { get { @@ -271,7 +271,7 @@ public static string LoginFailedMessage { } /// - /// 查找类似 Sign in failed. 的本地化字符串。 + /// Looks up a localized string similar to Sign in failed.. /// public static string LoginFailedText { get { @@ -280,7 +280,7 @@ public static string LoginFailedText { } /// - /// 查找类似 Connect To GitHub 的本地化字符串。 + /// Looks up a localized string similar to Connect To GitHub. /// public static string LoginTitle { get { @@ -289,7 +289,7 @@ public static string LoginTitle { } /// - /// 查找类似 You must pull before you can push 的本地化字符串。 + /// Looks up a localized string similar to You must pull before you can push. /// public static string MustPullBeforePush { get { @@ -298,7 +298,7 @@ public static string MustPullBeforePush { } /// - /// 查找类似 Checkout PR branch before navigating to Editor 的本地化字符串。 + /// Looks up a localized string similar to Checkout PR branch before navigating to Editor. /// public static string NavigateToEditorNotCheckedOutInfoMessage { get { @@ -307,7 +307,7 @@ public static string NavigateToEditorNotCheckedOutInfoMessage { } /// - /// 查找类似 Press Enter to navigate to Editor (PR branch must be checked out) 的本地化字符串。 + /// Looks up a localized string similar to Press Enter to navigate to Editor (PR branch must be checked out). /// public static string NavigateToEditorNotCheckedOutStatusMessage { get { @@ -316,7 +316,7 @@ public static string NavigateToEditorNotCheckedOutStatusMessage { } /// - /// 查找类似 Press Enter to navigate to Editor 的本地化字符串。 + /// Looks up a localized string similar to Press Enter to navigate to Editor. /// public static string NavigateToEditorStatusMessage { get { @@ -325,7 +325,7 @@ public static string NavigateToEditorStatusMessage { } /// - /// 查找类似 No commits to pull 的本地化字符串。 + /// Looks up a localized string similar to No commits to pull. /// public static string NoCommitsToPull { get { @@ -334,7 +334,7 @@ public static string NoCommitsToPull { } /// - /// 查找类似 No commits to push 的本地化字符串。 + /// Looks up a localized string similar to No commits to push. /// public static string NoCommitsToPush { get { @@ -343,7 +343,7 @@ public static string NoCommitsToPush { } /// - /// 查找类似 *No description provided.* 的本地化字符串。 + /// Looks up a localized string similar to *No description provided.*. /// public static string NoDescriptionProvidedMarkdown { get { @@ -352,7 +352,7 @@ public static string NoDescriptionProvidedMarkdown { } /// - /// 查找类似 Please enter your password 的本地化字符串。 + /// Looks up a localized string similar to Please enter your password. /// public static string PasswordValidatorEmpty { get { @@ -361,7 +361,7 @@ public static string PasswordValidatorEmpty { } /// - /// 查找类似 Pull Request for branch **{0}** created successfully at [{1}]({2}) 的本地化字符串。 + /// Looks up a localized string similar to Pull Request for branch **{0}** created successfully at [{1}]({2}). /// public static string PRCreatedUpstream { get { @@ -370,7 +370,7 @@ public static string PRCreatedUpstream { } /// - /// 查找类似 Publish repository 的本地化字符串。 + /// Looks up a localized string similar to Publish repository. /// public static string PublishTitle { get { @@ -379,7 +379,7 @@ public static string PublishTitle { } /// - /// 查找类似 Publish repository to {0} 的本地化字符串。 + /// Looks up a localized string similar to Publish repository to {0}. /// public static string PublishToTitle { get { @@ -388,7 +388,7 @@ public static string PublishToTitle { } /// - /// 查找类似 Please enter a title for the Pull Request 的本地化字符串。 + /// Looks up a localized string similar to Please enter a title for the Pull Request. /// public static string PullRequestCreationTitleValidatorEmpty { get { @@ -397,7 +397,7 @@ public static string PullRequestCreationTitleValidatorEmpty { } /// - /// 查找类似 Checkout {0} 的本地化字符串。 + /// Looks up a localized string similar to Checkout {0}. /// public static string PullRequestDetailsCheckout { get { @@ -406,7 +406,7 @@ public static string PullRequestDetailsCheckout { } /// - /// 查找类似 Checkout to {0} 的本地化字符串。 + /// Looks up a localized string similar to Checkout to {0}. /// public static string PullRequestDetailsCheckoutTo { get { @@ -415,7 +415,7 @@ public static string PullRequestDetailsCheckoutTo { } /// - /// 查找类似 Pull from {0} branch {1} 的本地化字符串。 + /// Looks up a localized string similar to Pull from {0} branch {1}. /// public static string PullRequestDetailsPullToolTip { get { @@ -424,7 +424,7 @@ public static string PullRequestDetailsPullToolTip { } /// - /// 查找类似 Push to {0} branch {1} 的本地化字符串。 + /// Looks up a localized string similar to Push to {0} branch {1}. /// public static string PullRequestDetailsPushToolTip { get { @@ -433,7 +433,7 @@ public static string PullRequestDetailsPushToolTip { } /// - /// 查找类似 Pull Request 的本地化字符串。 + /// Looks up a localized string similar to Pull Request. /// public static string PullRequestNavigationItemText { get { @@ -442,7 +442,7 @@ public static string PullRequestNavigationItemText { } /// - /// 查找类似 Pull Requests 的本地化字符串。 + /// Looks up a localized string similar to Pull Requests. /// public static string PullRequestsNavigationItemText { get { @@ -451,7 +451,7 @@ public static string PullRequestsNavigationItemText { } /// - /// 查找类似 Source and target branch cannot be the same 的本地化字符串。 + /// Looks up a localized string similar to Source and target branch cannot be the same. /// public static string PullRequestSourceAndTargetBranchTheSame { get { @@ -460,7 +460,7 @@ public static string PullRequestSourceAndTargetBranchTheSame { } /// - /// 查找类似 Source branch doesn't exist remotely, have you pushed it? 的本地化字符串。 + /// Looks up a localized string similar to Source branch doesn't exist remotely, have you pushed it?. /// public static string PullRequestSourceBranchDoesNotExist { get { @@ -469,7 +469,7 @@ public static string PullRequestSourceBranchDoesNotExist { } /// - /// 查找类似 remote 的本地化字符串。 + /// Looks up a localized string similar to remote. /// public static string Remote { get { @@ -478,7 +478,7 @@ public static string Remote { } /// - /// 查找类似 rename 的本地化字符串。 + /// Looks up a localized string similar to rename. /// public static string RenamedFileStatus { get { @@ -487,7 +487,7 @@ public static string RenamedFileStatus { } /// - /// 查找类似 No selected repository. 的本地化字符串。 + /// Looks up a localized string similar to No selected repository.. /// public static string RepositoryCloneFailedNoSelectedRepo { get { @@ -496,7 +496,7 @@ public static string RepositoryCloneFailedNoSelectedRepo { } /// - /// 查找类似 Please enter a repository path 的本地化字符串。 + /// Looks up a localized string similar to Please enter a repository path. /// public static string RepositoryCreationClonePathEmpty { get { @@ -505,7 +505,7 @@ public static string RepositoryCreationClonePathEmpty { } /// - /// 查找类似 Please enter a valid path 的本地化字符串。 + /// Looks up a localized string similar to Please enter a valid path. /// public static string RepositoryCreationClonePathInvalid { get { @@ -514,7 +514,7 @@ public static string RepositoryCreationClonePathInvalid { } /// - /// 查找类似 Path contains invalid characters 的本地化字符串。 + /// Looks up a localized string similar to Path contains invalid characters. /// public static string RepositoryCreationClonePathInvalidCharacters { get { @@ -523,7 +523,7 @@ public static string RepositoryCreationClonePathInvalidCharacters { } /// - /// 查找类似 Path too long 的本地化字符串。 + /// Looks up a localized string similar to Path too long. /// public static string RepositoryCreationClonePathTooLong { get { @@ -532,7 +532,7 @@ public static string RepositoryCreationClonePathTooLong { } /// - /// 查找类似 Repository '{0}/{1}' already exists. 的本地化字符串。 + /// Looks up a localized string similar to Repository '{0}/{1}' already exists.. /// public static string RepositoryCreationFailedAlreadyExists { get { @@ -541,7 +541,7 @@ public static string RepositoryCreationFailedAlreadyExists { } /// - /// 查找类似 Change the repository name or select a different account and try again. 的本地化字符串。 + /// Looks up a localized string similar to Change the repository name or select a different account and try again.. /// public static string RepositoryCreationFailedAlreadyExistsMessage { get { @@ -550,7 +550,7 @@ public static string RepositoryCreationFailedAlreadyExistsMessage { } /// - /// 查找类似 Exceeded private repositories quota. 的本地化字符串。 + /// Looks up a localized string similar to Exceeded private repositories quota.. /// public static string RepositoryCreationFailedQuota { get { @@ -559,7 +559,7 @@ public static string RepositoryCreationFailedQuota { } /// - /// 查找类似 Repository with same name already exists at this location 的本地化字符串。 + /// Looks up a localized string similar to Repository with same name already exists at this location. /// public static string RepositoryNameValidatorAlreadyExists { get { @@ -568,7 +568,7 @@ public static string RepositoryNameValidatorAlreadyExists { } /// - /// 查找类似 Please enter a repository name 的本地化字符串。 + /// Looks up a localized string similar to Please enter a repository name. /// public static string RepositoryNameValidatorEmpty { get { @@ -577,7 +577,7 @@ public static string RepositoryNameValidatorEmpty { } /// - /// 查找类似 Repository name must be fewer than 100 characters 的本地化字符串。 + /// Looks up a localized string similar to Repository name must be fewer than 100 characters. /// public static string RepositoryNameValidatorTooLong { get { @@ -586,7 +586,7 @@ public static string RepositoryNameValidatorTooLong { } /// - /// 查找类似 Will be created as {0} 的本地化字符串。 + /// Looks up a localized string similar to Will be created as {0}. /// public static string SafeRepositoryNameWarning { get { @@ -595,7 +595,7 @@ public static string SafeRepositoryNameWarning { } /// - /// 查找类似 The source repository is no longer available. 的本地化字符串。 + /// Looks up a localized string similar to The source repository is no longer available.. /// public static string SourceRepositoryNoLongerAvailable { get { @@ -604,7 +604,7 @@ public static string SourceRepositoryNoLongerAvailable { } /// - /// 查找类似 Switch Origin 的本地化字符串。 + /// Looks up a localized string similar to Switch Origin. /// public static string SwitchOriginTitle { get { @@ -613,7 +613,7 @@ public static string SwitchOriginTitle { } /// - /// 查找类似 Sync {0} submodules 的本地化字符串。 + /// Looks up a localized string similar to Sync {0} submodules. /// public static string SyncSubmodules { get { @@ -622,7 +622,7 @@ public static string SyncSubmodules { } /// - /// 查找类似 Open the two-factor authentication app on your device to view your authentication code. 的本地化字符串。 + /// Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code.. /// public static string TwoFactorApp { get { @@ -631,7 +631,7 @@ public static string TwoFactorApp { } /// - /// 查找类似 We sent you a message via SMS with your authentication code. 的本地化字符串。 + /// Looks up a localized string similar to We sent you a message via SMS with your authentication code.. /// public static string TwoFactorSms { get { @@ -640,7 +640,7 @@ public static string TwoFactorSms { } /// - /// 查找类似 Two-Factor authentication required 的本地化字符串。 + /// Looks up a localized string similar to Two-Factor authentication required. /// public static string TwoFactorTitle { get { @@ -649,7 +649,7 @@ public static string TwoFactorTitle { } /// - /// 查找类似 Enter a sign in authentication code here 的本地化字符串。 + /// Looks up a localized string similar to Enter a sign in authentication code here. /// public static string TwoFactorUnknown { get { @@ -658,7 +658,7 @@ public static string TwoFactorUnknown { } /// - /// 查找类似 Please enter your username or email address 的本地化字符串。 + /// Looks up a localized string similar to Please enter your username or email address. /// public static string UsernameOrEmailValidatorEmpty { get { @@ -667,7 +667,7 @@ public static string UsernameOrEmailValidatorEmpty { } /// - /// 查找类似 Username or email address must not have spaces 的本地化字符串。 + /// Looks up a localized string similar to Username or email address must not have spaces. /// public static string UsernameOrEmailValidatorSpaces { get { @@ -676,7 +676,7 @@ public static string UsernameOrEmailValidatorSpaces { } /// - /// 查找类似 Cannot checkout as your working directory has uncommitted changes. 的本地化字符串。 + /// Looks up a localized string similar to Cannot checkout as your working directory has uncommitted changes.. /// public static string WorkingDirectoryHasUncommittedCHanges { get { diff --git a/src/GitHub.App/Resources.en-US.resx b/src/GitHub.App/Resources.en-US.resx deleted file mode 100644 index 124f512308..0000000000 --- a/src/GitHub.App/Resources.en-US.resx +++ /dev/null @@ -1,330 +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 - - - 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 - - - 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 deleted file mode 100644 index 4fedabe2d8..0000000000 --- a/src/GitHub.App/Resources.zh-Hans.resx +++ /dev/null @@ -1,329 +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 - - - 克隆一个 {0} 版本库 - - - 无法连接到github.com - - - 创建一个GitHub Gist - - - 创建一个{0}存储库 - - - GistFromVisualStudio.cs - - - 请输入企业网址 - - - 请输入有效网址 - - - 是否忘记了您的密码? - - - 您的用户名和密码 - - - 登录失败 - - - 连接到 GitHub - - - 请输入您的密码。 - - - 发布版本库 - - - 发布版本库至 {0} - - - 请输入请求的标题! - - - 源和目标分支不能相同! - - - 选择了项目。 - - - 请输入名称 - - - 请输入有效路径 - - - 包含无效字符 - - - 路径太长 - - - 版本库 '{0}/{1}'已存在。 - - - 请选择一个表单并且重试。 - - - 私密文档 - - - 同名的广告活动已存在 - - - 请输入姓名 - - - 这个名字不能超过100个字符 - - - 将要创建为 {0} - - - 在您的手机上安装双重验证程序：Google Authenticator - - - 我们将发送一条验证码短信到您的手机。 - - - 双重身份认证 - - - 输入任何你喜欢的一个标志 % ， - - - 请输入您的用户名或邮箱地址. - - - 用户名或电子邮件地址 - - - 拉取请求 - - - 推送请求 - - - 添加 - - - 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/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index 09afe0daad..36dd35ed3b 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -9,7 +9,6 @@ true - en-US @@ -419,36 +418,19 @@ - - - - Menus.ctmenu - InlineReviewsPackage.vsct - - + + + Menus.ctmenu - InlineReviewsPackage.vsct + Designer - - PreserveNewest - - - true - VSPackage.en-US.resources - VSPackage.resx - - + true VSPackage Designer - - - true - VSPackage.zh-Hans.resources - VSPackage.resx - + @@ -492,6 +474,11 @@ + + + PreserveNewest + + diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct deleted file mode 100644 index 8683904657..0000000000 --- a/src/GitHub.InlineReviews/InlineReviewsPackage.en-US.vsct +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct index 87faf3ace6..d9e99ccb84 100644 --- a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct +++ b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct @@ -22,7 +22,59 @@ - + + + + + + + + + + + + diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct deleted file mode 100644 index 8b41ede800..0000000000 --- a/src/GitHub.InlineReviews/InlineReviewsPackage.zh-Hans.vsct +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/GitHub.InlineReviews/Properties/AssemblyInfo.cs b/src/GitHub.InlineReviews/Properties/AssemblyInfo.cs index 79741354e3..f4657e8520 100644 --- a/src/GitHub.InlineReviews/Properties/AssemblyInfo.cs +++ b/src/GitHub.InlineReviews/Properties/AssemblyInfo.cs @@ -1,8 +1,6 @@ using System.Reflection; -using System.Resources; using System.Runtime.InteropServices; [assembly: AssemblyTitle("GitHub.InlineReviews")] [assembly: AssemblyDescription("Provides inline viewing of PR review comments")] [assembly: Guid("3bf91177-3d16-425d-9c62-50a86cf26298")] -[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] \ 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 6bcb598a71..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 - - - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - - - GitHub.InlineReviews - - \ 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 6bcb598a71..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 - - - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - - - GitHub.InlineReviews - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.InlineReviews/Views/CommentView.xaml index 028df5d7ff..7e49028622 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}"> - - + Pending + - + diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml index dff9888aee..c27c40447b 100644 --- a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml +++ b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml @@ -6,7 +6,6 @@ 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"> @@ -59,7 +58,7 @@ - + You must commit and push your changes to add a comment here. @@ -72,7 +71,7 @@ - - + + View, Checkout or Create a Pull request diff --git a/src/GitHub.StartPage/GitHub.StartPage.csproj b/src/GitHub.StartPage/GitHub.StartPage.csproj index 01609a21ed..74a2246009 100644 --- a/src/GitHub.StartPage/GitHub.StartPage.csproj +++ b/src/GitHub.StartPage/GitHub.StartPage.csproj @@ -7,7 +7,6 @@ $(VisualStudioVersion) $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true - en-US @@ -189,13 +188,7 @@ - - Resources.resx - - - Resources.resx - diff --git a/src/GitHub.StartPage/Properties/AssemblyInfo.cs b/src/GitHub.StartPage/Properties/AssemblyInfo.cs index 6341cfc3ff..ba001558de 100644 --- a/src/GitHub.StartPage/Properties/AssemblyInfo.cs +++ b/src/GitHub.StartPage/Properties/AssemblyInfo.cs @@ -1,6 +1,4 @@ using System.Reflection; -using System.Resources; [assembly: AssemblyTitle("GitHub.StartPage")] [assembly: AssemblyDescription("GitHub Start Page for Visual Studio")] -[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] \ No newline at end of file diff --git a/src/GitHub.StartPage/Resources.en-US.resx b/src/GitHub.StartPage/Resources.en-US.resx deleted file mode 100644 index c10fe53dd0..0000000000 --- a/src/GitHub.StartPage/Resources.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 - - - Powerful collaboration, code review, and code management for open source and private projects. - - \ No newline at end of file diff --git a/src/GitHub.StartPage/Resources.zh-Hans.resx b/src/GitHub.StartPage/Resources.zh-Hans.resx deleted file mode 100644 index 9b52e7d241..0000000000 --- a/src/GitHub.StartPage/Resources.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 - - - 为开源和私有项目提供强大的协作、代码评审和代码管理。 - - \ No newline at end of file diff --git a/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs b/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs index 6e57f97270..37e833d006 100644 --- a/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs +++ b/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Resources; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -7,7 +6,7 @@ [assembly: AssemblyTitle("GitHub.UI.Reactive")] [assembly: AssemblyDescription("GitHub flavored WPF styles and controls that require Rx and RxUI")] [assembly: Guid("885a491c-1d13-49e7-baa6-d61f424befcb")] -[assembly: NeutralResourcesLanguage("en-US")] + [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx b/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.resx deleted file mode 100644 index d58980a38d..0000000000 --- a/src/GitHub.UI/Controls/Octicons/OcticonPaths.en-US.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.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index 38a2064b33..041f14a08d 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -255,25 +255,16 @@ - - Controls\Octicons\OcticonPaths.resx - Designer ResXFileCodeGenerator OcticonPaths.Designer.cs - - Resources.resx - ResXFileCodeGenerator Resources.Designer.cs Designer - - Resources.resx - PublicResXFileCodeGenerator AutomationIDs.Designer.cs diff --git a/src/GitHub.UI/Properties/AssemblyInfo.cs b/src/GitHub.UI/Properties/AssemblyInfo.cs index 80e49b8aae..d4827fb54e 100644 --- a/src/GitHub.UI/Properties/AssemblyInfo.cs +++ b/src/GitHub.UI/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Resources; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -7,7 +6,7 @@ [assembly: AssemblyTitle("GitHub.UI")] [assembly: AssemblyDescription("GitHub flavored WPF styles and controls")] [assembly: Guid("f3cec21e-6a86-43ae-97a6-a274fa31efbe")] -[assembly: NeutralResourcesLanguage("en-US")] + [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/src/GitHub.UI/Resources.en-US.resx b/src/GitHub.UI/Resources.en-US.resx deleted file mode 100644 index 387aeaf04a..0000000000 --- a/src/GitHub.UI/Resources.en-US.resx +++ /dev/null @@ -1,156 +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 - - - {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/Resources.zh-Hans.resx b/src/GitHub.UI/Resources.zh-Hans.resx deleted file mode 100644 index a7677e55e3..0000000000 --- a/src/GitHub.UI/Resources.zh-Hans.resx +++ /dev/null @@ -1,156 +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 - - - {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/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index 426ea733ca..3e15e52e4e 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -252,18 +252,11 @@ - - Resources.resx - PublicResXFileCodeGenerator Resources.Designer.cs Designer - - Resources.resx - Designer - diff --git a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs index f2deb3e264..0d5801ea70 100644 --- a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs +++ b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows.Markup; @@ -7,7 +6,7 @@ [assembly: AssemblyTitle("GitHub.VisualStudio.UI")] [assembly: AssemblyDescription("GitHub.VisualStudio.UI")] [assembly: Guid("d1dfbb0c-b570-4302-8f1e-2e3a19c41961")] -[assembly: NeutralResourcesLanguage("en-US")] + [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Controls")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Views")] diff --git a/src/GitHub.VisualStudio.UI/Resources.Designer.cs b/src/GitHub.VisualStudio.UI/Resources.Designer.cs index a291b7a1ad..777996147a 100644 --- a/src/GitHub.VisualStudio.UI/Resources.Designer.cs +++ b/src/GitHub.VisualStudio.UI/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace GitHub.VisualStudio.UI { /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 + // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// 返回此类使用的缓存的 ResourceManager 实例。 + /// 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 { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 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 { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// 查找类似 Add review comment 的本地化字符串。 + /// Looks up a localized string similar to Add review comment. /// public static string AddReviewComment { get { @@ -70,7 +70,7 @@ public static string AddReviewComment { } /// - /// 查找类似 Add a single comment 的本地化字符串。 + /// Looks up a localized string similar to Add a single comment. /// public static string AddSingleComment { get { @@ -79,7 +79,7 @@ public static string AddSingleComment { } /// - /// 查找类似 Add your review 的本地化字符串。 + /// Looks up a localized string similar to Add your review. /// public static string AddYourReview { get { @@ -88,25 +88,7 @@ public static string AddYourReview { } /// - /// 查找类似 Approve 的本地化字符串。 - /// - public static string Approve { - get { - return ResourceManager.GetString("Approve", resourceCulture); - } - } - - /// - /// 查找类似 Assignee 的本地化字符串。 - /// - public static string Assignee { - get { - return ResourceManager.GetString("Assignee", resourceCulture); - } - } - - /// - /// 查找类似 Invalid authentication code 的本地化字符串。 + /// Looks up a localized string similar to Invalid authentication code. /// public static string authenticationFailedLabelContent { get { @@ -115,7 +97,7 @@ public static string authenticationFailedLabelContent { } /// - /// 查找类似 Try entering the code again or clicking the resend button to get a new authentication code. 的本地化字符串。 + /// 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 { @@ -124,7 +106,7 @@ public static string authenticationFailedLabelMessage { } /// - /// 查找类似 Authentication code sent! 的本地化字符串。 + /// Looks up a localized string similar to Authentication code sent!. /// public static string authenticationSentLabelContent { get { @@ -133,7 +115,7 @@ public static string authenticationSentLabelContent { } /// - /// 查找类似 If you do not receive the authentication code, contact support@github.com. 的本地化字符串。 + /// Looks up a localized string similar to If you do not receive the authentication code, contact support@github.com.. /// public static string authenticationSentLabelMessage { get { @@ -142,25 +124,7 @@ public static string authenticationSentLabelMessage { } /// - /// 查找类似 Author 的本地化字符串。 - /// - public static string Author { - get { - return ResourceManager.GetString("Author", resourceCulture); - } - } - - /// - /// 查找类似 Back 的本地化字符串。 - /// - public static string Back { - get { - return ResourceManager.GetString("Back", resourceCulture); - } - } - - /// - /// 查找类似 The GitHub extension is not available inside Blend 的本地化字符串。 + /// Looks up a localized string similar to The GitHub extension is not available inside Blend. /// public static string BlendDialogText { get { @@ -169,7 +133,7 @@ public static string BlendDialogText { } /// - /// 查找类似 Powerful collaboration, code review, and code management for open source and private projects. 的本地化字符串。 + /// 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 { @@ -178,7 +142,7 @@ public static string BlurbText { } /// - /// 查找类似 Browse 的本地化字符串。 + /// Looks up a localized string similar to Browse. /// public static string browsePathButtonContent { get { @@ -187,16 +151,7 @@ public static string browsePathButtonContent { } /// - /// 查找类似 Cancel 的本地化字符串。 - /// - public static string Cancel { - get { - return ResourceManager.GetString("Cancel", resourceCulture); - } - } - - /// - /// 查找类似 Cancel 的本地化字符串。 + /// Looks up a localized string similar to Cancel. /// public static string CancelLink { get { @@ -205,7 +160,7 @@ public static string CancelLink { } /// - /// 查找类似 Changes ({0}) 的本地化字符串。 + /// Looks up a localized string similar to Changes ({0}). /// public static string ChangesCountFormat { get { @@ -214,16 +169,7 @@ public static string ChangesCountFormat { } /// - /// 查找类似 This file has changed since the permalink was created 的本地化字符串。 - /// - public static string ChangesInWorkingDirectoryMessage { - get { - return ResourceManager.GetString("ChangesInWorkingDirectoryMessage", resourceCulture); - } - } - - /// - /// 查找类似 Clone 的本地化字符串。 + /// Looks up a localized string similar to Clone. /// public static string CloneLink { get { @@ -232,25 +178,7 @@ public static string CloneLink { } /// - /// 查找类似 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 的本地化字符串。 + /// Looks up a localized string similar to Compare File as Default Action. /// public static string CompareFileAsDefaultAction { get { @@ -259,7 +187,7 @@ public static string CompareFileAsDefaultAction { } /// - /// 查找类似 Continue your review 的本地化字符串。 + /// Looks up a localized string similar to Continue your review. /// public static string ContinueYourReview { get { @@ -268,7 +196,7 @@ public static string ContinueYourReview { } /// - /// 查找类似 Could not connect to github.com 的本地化字符串。 + /// Looks up a localized string similar to Could not connect to github.com. /// public static string couldNotConnectToGitHubText { get { @@ -277,7 +205,7 @@ public static string couldNotConnectToGitHubText { } /// - /// 查找类似 Could not connect to the server. 的本地化字符串。 + /// Looks up a localized string similar to Could not connect to the server.. /// public static string couldNotConnectToTheServerText { get { @@ -286,7 +214,7 @@ public static string couldNotConnectToTheServerText { } /// - /// 查找类似 Create an account 的本地化字符串。 + /// Looks up a localized string similar to Create an account. /// public static string CreateAccountLink { get { @@ -295,16 +223,7 @@ public static string CreateAccountLink { } /// - /// 查找类似 create a pull request 的本地化字符串。 - /// - public static string CreateAPullRequest { - get { - return ResourceManager.GetString("CreateAPullRequest", resourceCulture); - } - } - - /// - /// 查找类似 Create 的本地化字符串。 + /// Looks up a localized string similar to Create. /// public static string CreateLink { get { @@ -313,25 +232,7 @@ public static string CreateLink { } /// - /// 查找类似 Create New 的本地化字符串。 - /// - public static string CreateNew { - get { - return ResourceManager.GetString("CreateNew", resourceCulture); - } - } - - /// - /// 查找类似 Create pull request 的本地化字符串。 - /// - public static string CreatePullRequest { - get { - return ResourceManager.GetString("CreatePullRequest", resourceCulture); - } - } - - /// - /// 查找类似 Are you sure you want to delete this comment? 的本地化字符串。 + /// Looks up a localized string similar to Are you sure you want to delete this comment?. /// public static string DeleteCommentConfirmation { get { @@ -340,7 +241,7 @@ public static string DeleteCommentConfirmation { } /// - /// 查找类似 Delete Comment 的本地化字符串。 + /// Looks up a localized string similar to Delete Comment. /// public static string DeleteCommentConfirmationCaption { get { @@ -349,7 +250,7 @@ public static string DeleteCommentConfirmationCaption { } /// - /// 查找类似 Description 的本地化字符串。 + /// Looks up a localized string similar to Description. /// public static string Description { get { @@ -358,7 +259,7 @@ public static string Description { } /// - /// 查找类似 Description (Optional) 的本地化字符串。 + /// Looks up a localized string similar to Description (Optional). /// public static string DescriptionOptional { get { @@ -367,16 +268,7 @@ public static string DescriptionOptional { } /// - /// 查找类似 Please open the repository '{0}' and try again 的本地化字符串。 - /// - public static string DifferentRepositoryMessage { - get { - return ResourceManager.GetString("DifferentRepositoryMessage", resourceCulture); - } - } - - /// - /// 查找类似 Don’t have an account? 的本地化字符串。 + /// Looks up a localized string similar to Don’t have an account? . /// public static string dontHaveAnAccountText { get { @@ -385,7 +277,7 @@ public static string dontHaveAnAccountText { } /// - /// 查找类似 Don’t have GitHub Enterprise? 的本地化字符串。 + /// Looks up a localized string similar to Don’t have GitHub Enterprise? . /// public static string dontHaveGitHubEnterpriseText { get { @@ -394,7 +286,7 @@ public static string dontHaveGitHubEnterpriseText { } /// - /// 查找类似 Please check your internet connection and try again. 的本地化字符串。 + /// Looks up a localized string similar to Please check your internet connection and try again.. /// public static string dotComConnectionFailedMessageMessage { get { @@ -403,7 +295,7 @@ public static string dotComConnectionFailedMessageMessage { } /// - /// 查找类似 The host isn't available or is not a GitHub Enterprise server. Check the address and try again. 的本地化字符串。 + /// 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 { @@ -412,7 +304,7 @@ public static string enterpriseConnectingFailedMessage { } /// - /// 查找类似 GitHub Enterprise server address 的本地化字符串。 + /// Looks up a localized string similar to GitHub Enterprise server address. /// public static string enterpriseUrlPromptText { get { @@ -421,7 +313,7 @@ public static string enterpriseUrlPromptText { } /// - /// 查找类似 Could not copy to the clipboard. Please try again. 的本地化字符串。 + /// Looks up a localized string similar to Could not copy to the clipboard. Please try again.. /// public static string Error_FailedToCopyToClipboard { get { @@ -430,7 +322,7 @@ public static string Error_FailedToCopyToClipboard { } /// - /// 查找类似 File Name 的本地化字符串。 + /// Looks up a localized string similar to File Name. /// public static string fileNameText { get { @@ -439,7 +331,7 @@ public static string fileNameText { } /// - /// 查找类似 Filter branches 的本地化字符串。 + /// Looks up a localized string similar to Filter branches. /// public static string filterBranchesText { get { @@ -448,16 +340,7 @@ public static string filterBranchesText { } /// - /// 查找类似 Filter by Author 的本地化字符串。 - /// - public static string FilterByAuthor { - get { - return ResourceManager.GetString("FilterByAuthor", resourceCulture); - } - } - - /// - /// 查找类似 Search repositories 的本地化字符串。 + /// Looks up a localized string similar to Search repositories. /// public static string filterTextPromptText { get { @@ -466,7 +349,7 @@ public static string filterTextPromptText { } /// - /// 查找类似 (forgot your password?) 的本地化字符串。 + /// Looks up a localized string similar to (forgot your password?). /// public static string ForgotPasswordLink { get { @@ -475,7 +358,7 @@ public static string ForgotPasswordLink { } /// - /// 查找类似 Fork 的本地化字符串。 + /// Looks up a localized string similar to Fork. /// public static string ForkNavigationItemText { get { @@ -484,25 +367,7 @@ public static string ForkNavigationItemText { } /// - /// 查找类似 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 的本地化字符串。 + /// Looks up a localized string similar to Get Started. /// public static string GetStartedText { get { @@ -511,7 +376,7 @@ public static string GetStartedText { } /// - /// 查找类似 Gist created 的本地化字符串。 + /// Looks up a localized string similar to Gist created. /// public static string gistCreatedMessage { get { @@ -520,7 +385,7 @@ public static string gistCreatedMessage { } /// - /// 查找类似 Failed to create gist 的本地化字符串。 + /// Looks up a localized string similar to Failed to create gist. /// public static string gistCreationFailedMessage { get { @@ -529,7 +394,7 @@ public static string gistCreationFailedMessage { } /// - /// 查找类似 Connect… 的本地化字符串。 + /// Looks up a localized string similar to Connect…. /// public static string GitHubInvitationSectionConnectLabel { get { @@ -538,7 +403,7 @@ public static string GitHubInvitationSectionConnectLabel { } /// - /// 查找类似 Publish to GitHub 的本地化字符串。 + /// Looks up a localized string similar to Publish to GitHub. /// public static string GitHubPublishSectionTitle { get { @@ -547,7 +412,7 @@ public static string GitHubPublishSectionTitle { } /// - /// 查找类似 Graphs 的本地化字符串。 + /// Looks up a localized string similar to Graphs. /// public static string GraphsNavigationItemText { get { @@ -556,7 +421,7 @@ public static string GraphsNavigationItemText { } /// - /// 查找类似 Git ignore 的本地化字符串。 + /// Looks up a localized string similar to Git ignore. /// public static string ignoreTemplateListText { get { @@ -565,7 +430,7 @@ public static string ignoreTemplateListText { } /// - /// 查找类似 Issues 的本地化字符串。 + /// Looks up a localized string similar to Issues. /// public static string IssuesNavigationItemText { get { @@ -574,7 +439,7 @@ public static string IssuesNavigationItemText { } /// - /// 查找类似 Learn more 的本地化字符串。 + /// Looks up a localized string similar to Learn more. /// public static string learnMoreLink { get { @@ -583,7 +448,7 @@ public static string learnMoreLink { } /// - /// 查找类似 License 的本地化字符串。 + /// Looks up a localized string similar to License. /// public static string licenseListText { get { @@ -592,7 +457,7 @@ public static string licenseListText { } /// - /// 查找类似 Link copied to clipboard 的本地化字符串。 + /// Looks up a localized string similar to Link copied to clipboard. /// public static string LinkCopiedToClipboardMessage { get { @@ -601,7 +466,7 @@ public static string LinkCopiedToClipboardMessage { } /// - /// 查找类似 Some or all repositories may not have loaded. Close the dialog and try again. 的本地化字符串。 + /// 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 { @@ -610,7 +475,7 @@ public static string loadingFailedMessageContent { } /// - /// 查找类似 An error occurred while loading repositories 的本地化字符串。 + /// Looks up a localized string similar to An error occurred while loading repositories. /// public static string loadingFailedMessageMessage { get { @@ -619,7 +484,7 @@ public static string loadingFailedMessageMessage { } /// - /// 查找类似 Local branch up to date 的本地化字符串。 + /// Looks up a localized string similar to Local branch up to date. /// public static string LocalBranchUpToDate { get { @@ -628,7 +493,7 @@ public static string LocalBranchUpToDate { } /// - /// 查找类似 Local path 的本地化字符串。 + /// Looks up a localized string similar to Local path. /// public static string localPathText { get { @@ -637,7 +502,7 @@ public static string localPathText { } /// - /// 查找类似 Check your username and password, then try again 的本地化字符串。 + /// Looks up a localized string similar to Check your username and password, then try again. /// public static string LoginFailedMessage { get { @@ -646,7 +511,7 @@ public static string LoginFailedMessage { } /// - /// 查找类似 Sign in failed. 的本地化字符串。 + /// Looks up a localized string similar to Sign in failed.. /// public static string LoginFailedText { get { @@ -655,7 +520,7 @@ public static string LoginFailedText { } /// - /// 查找类似 Sign in 的本地化字符串。 + /// Looks up a localized string similar to Sign in. /// public static string LoginLink { get { @@ -664,7 +529,7 @@ public static string LoginLink { } /// - /// 查找类似 Private Repository 的本地化字符串。 + /// Looks up a localized string similar to Private Repository. /// public static string makePrivateContent { get { @@ -673,7 +538,7 @@ public static string makePrivateContent { } /// - /// 查找类似 Private Gist 的本地化字符串。 + /// Looks up a localized string similar to Private Gist. /// public static string makePrivateGist { get { @@ -682,7 +547,7 @@ public static string makePrivateGist { } /// - /// 查找类似 Name 的本地化字符串。 + /// Looks up a localized string similar to Name. /// public static string nameText { get { @@ -691,34 +556,7 @@ public static string nameText { } /// - /// 查找类似 Next Comment 的本地化字符串。 - /// - public static string NextComment { - get { - return ResourceManager.GetString("NextComment", resourceCulture); - } - } - - /// - /// 查找类似 There is no active repository to navigate 的本地化字符串。 - /// - public static string NoActiveRepositoryMessage { - get { - return ResourceManager.GetString("NoActiveRepositoryMessage", resourceCulture); - } - } - - /// - /// 查找类似 Couldn't a find a GitHub URL in clipboard 的本地化字符串。 - /// - public static string NoGitHubUrlMessage { - get { - return ResourceManager.GetString("NoGitHubUrlMessage", resourceCulture); - } - } - - /// - /// 查找类似 No repositories 的本地化字符串。 + /// Looks up a localized string similar to No repositories. /// public static string noRepositoriesMessageText { get { @@ -727,34 +565,7 @@ public static string noRepositoriesMessageText { } /// - /// 查找类似 The target URL has a different owner to the current repository. 的本地化字符串。 - /// - public static string NoResolveDifferentOwnerMessage { - get { - return ResourceManager.GetString("NoResolveDifferentOwnerMessage", resourceCulture); - } - } - - /// - /// 查找类似 Couldn't find target URL in current repository. Try again after doing a fetch. 的本地化字符串。 - /// - public static string NoResolveSameOwnerMessage { - get { - return ResourceManager.GetString("NoResolveSameOwnerMessage", resourceCulture); - } - } - - /// - /// 查找类似 No results matched your search. 的本地化字符串。 - /// - public static string NoResultsMatchedYourSearch { - get { - return ResourceManager.GetString("NoResultsMatchedYourSearch", resourceCulture); - } - } - - /// - /// 查找类似 This repository is not on GitHub 的本地化字符串。 + /// Looks up a localized string similar to This repository is not on GitHub. /// public static string NotAGitHubRepository { get { @@ -763,7 +574,7 @@ public static string NotAGitHubRepository { } /// - /// 查找类似 Publish this repository to GitHub and get powerful collaboration, code review, and code management for open source and private projects. 的本地化字符串。 + /// 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.. /// public static string NotAGitHubRepositoryMessage { get { @@ -772,7 +583,7 @@ public static string NotAGitHubRepositoryMessage { } /// - /// 查找类似 No repository 的本地化字符串。 + /// Looks up a localized string similar to No repository. /// public static string NotAGitRepository { get { @@ -781,7 +592,7 @@ public static string NotAGitRepository { } /// - /// 查找类似 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. 的本地化字符串。 + /// 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.. /// public static string NotAGitRepositoryMessage { get { @@ -790,7 +601,7 @@ public static string NotAGitRepositoryMessage { } /// - /// 查找类似 You are not signed in to {0}, so certain git operations may fail. [Sign in now]({1}) 的本地化字符串。 + /// Looks up a localized string similar to You are not signed in to {0}, so certain git operations may fail. [Sign in now]({1}). /// public static string NotLoggedInMessage { get { @@ -799,7 +610,7 @@ public static string NotLoggedInMessage { } /// - /// 查找类似 Open 的本地化字符串。 + /// Looks up a localized string similar to Open. /// public static string Open { get { @@ -808,7 +619,7 @@ public static string Open { } /// - /// 查找类似 Open File as Default Action 的本地化字符串。 + /// Looks up a localized string similar to Open File as Default Action. /// public static string OpenFileAsDefaultAction { get { @@ -817,7 +628,7 @@ public static string OpenFileAsDefaultAction { } /// - /// 查找类似 Open File in Solution 的本地化字符串。 + /// Looks up a localized string similar to Open File in Solution. /// public static string OpenFileInSolution { get { @@ -826,7 +637,7 @@ public static string OpenFileInSolution { } /// - /// 查找类似 Open in Browser 的本地化字符串。 + /// Looks up a localized string similar to Open in Browser. /// public static string openInBrowser { get { @@ -835,7 +646,7 @@ public static string openInBrowser { } /// - /// 查找类似 View Pull Request on GitHub 的本地化字符串。 + /// Looks up a localized string similar to View Pull Request on GitHub. /// public static string OpenPROnGitHubToolTip { get { @@ -844,16 +655,7 @@ public static string OpenPROnGitHubToolTip { } /// - /// 查找类似 Open repository at '{0}'? 的本地化字符串。 - /// - public static string OpenRepositoryAtDir { - get { - return ResourceManager.GetString("OpenRepositoryAtDir", resourceCulture); - } - } - - /// - /// 查找类似 Open the two-factor authentication app on your device to view your authentication code. 的本地化字符串。 + /// 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 { @@ -862,7 +664,7 @@ public static string openTwoFactorAuthAppText { } /// - /// 查找类似 Debugging 的本地化字符串。 + /// Looks up a localized string similar to Debugging. /// public static string Options_DebuggingTitle { get { @@ -871,7 +673,7 @@ public static string Options_DebuggingTitle { } /// - /// 查找类似 Show PR comments on editor margin 的本地化字符串。 + /// Looks up a localized string similar to Show PR comments on editor margin. /// public static string Options_EditorCommentsLabel { get { @@ -880,7 +682,7 @@ public static string Options_EditorCommentsLabel { } /// - /// 查找类似 Enable Trace Logging 的本地化字符串。 + /// Looks up a localized string similar to Enable Trace Logging. /// public static string Options_EnableTraceLoggingText { get { @@ -889,7 +691,7 @@ public static string Options_EnableTraceLoggingText { } /// - /// 查找类似 These features might change in a future version 的本地化字符串。 + /// Looks up a localized string similar to These features might change in a future version. /// public static string Options_ExperimentalNote { get { @@ -898,7 +700,7 @@ public static string Options_ExperimentalNote { } /// - /// 查找类似 Experimental features 的本地化字符串。 + /// Looks up a localized string similar to Experimental features. /// public static string Options_ExperimentalTitle { get { @@ -907,7 +709,7 @@ public static string Options_ExperimentalTitle { } /// - /// 查找类似 Show Fork button in Team Explorer 的本地化字符串。 + /// Looks up a localized string similar to Show Fork button in Team Explorer. /// public static string Options_ForkButtonLabel { get { @@ -916,7 +718,7 @@ public static string Options_ForkButtonLabel { } /// - /// 查找类似 Help us improve by sending anonymous usage data 的本地化字符串。 + /// Looks up a localized string similar to Help us improve by sending anonymous usage data. /// public static string Options_MetricsLabel { get { @@ -925,7 +727,7 @@ public static string Options_MetricsLabel { } /// - /// 查找类似 Privacy 的本地化字符串。 + /// Looks up a localized string similar to Privacy. /// public static string Options_PrivacyTitle { get { @@ -934,7 +736,7 @@ public static string Options_PrivacyTitle { } /// - /// 查找类似 or 的本地化字符串。 + /// Looks up a localized string similar to or. /// public static string orText { get { @@ -943,16 +745,7 @@ public static string orText { } /// - /// 查找类似 Outdated comments 的本地化字符串。 - /// - public static string OutdatedComments { - get { - return ResourceManager.GetString("OutdatedComments", resourceCulture); - } - } - - /// - /// 查找类似 Password 的本地化字符串。 + /// Looks up a localized string similar to Password. /// public static string PasswordPrompt { get { @@ -961,7 +754,7 @@ public static string PasswordPrompt { } /// - /// 查找类似 Path 的本地化字符串。 + /// Looks up a localized string similar to Path. /// public static string pathText { get { @@ -970,25 +763,7 @@ public static string pathText { } /// - /// 查找类似 Pending 的本地化字符串。 - /// - public static string Pending { - get { - return ResourceManager.GetString("Pending", resourceCulture); - } - } - - /// - /// 查找类似 Previous Comment 的本地化字符串。 - /// - public static string PreviousComment { - get { - return ResourceManager.GetString("PreviousComment", resourceCulture); - } - } - - /// - /// 查找类似 by 的本地化字符串。 + /// Looks up a localized string similar to by. /// public static string prUpdatedByText { get { @@ -997,7 +772,7 @@ public static string prUpdatedByText { } /// - /// 查找类似 Updated 的本地化字符串。 + /// Looks up a localized string similar to Updated. /// public static string prUpdatedText { get { @@ -1006,7 +781,7 @@ public static string prUpdatedText { } /// - /// 查找类似 Publish 的本地化字符串。 + /// Looks up a localized string similar to Publish. /// public static string publishText { get { @@ -1015,7 +790,7 @@ public static string publishText { } /// - /// 查找类似 Publish to GitHub 的本地化字符串。 + /// Looks up a localized string similar to Publish to GitHub. /// public static string PublishToGitHubButton { get { @@ -1024,25 +799,7 @@ public static string PublishToGitHubButton { } /// - /// 查找类似 Pull 的本地化字符串。 - /// - public static string Pull { - get { - return ResourceManager.GetString("Pull", resourceCulture); - } - } - - /// - /// 查找类似 Pull requests let you tell others about changes you've pushed to a repository on GitHub 的本地化字符串。 - /// - public static string PullRequestsLetYouTellOthersAboutChangesYouVePushedToARepositoryOnGitHub { - get { - return ResourceManager.GetString("PullRequestsLetYouTellOthersAboutChangesYouVePushedToARepositoryOnGitHub", resourceCulture); - } - } - - /// - /// 查找类似 Pull Requests 的本地化字符串。 + /// Looks up a localized string similar to Pull Requests. /// public static string PullRequestsNavigationItemText { get { @@ -1051,7 +808,7 @@ public static string PullRequestsNavigationItemText { } /// - /// 查找类似 Pulse 的本地化字符串。 + /// Looks up a localized string similar to Pulse. /// public static string PulseNavigationItemText { get { @@ -1060,16 +817,7 @@ public static string PulseNavigationItemText { } /// - /// 查找类似 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. 的本地化字符串。 + /// 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 { @@ -1078,7 +826,7 @@ public static string RepoDoesNotHaveRemoteText { } /// - /// 查找类似 Repository Name 的本地化字符串。 + /// Looks up a localized string similar to Repository Name. /// public static string RepoNameText { get { @@ -1087,7 +835,7 @@ public static string RepoNameText { } /// - /// 查找类似 Repository created successfully. 的本地化字符串。 + /// Looks up a localized string similar to Repository created successfully.. /// public static string RepositoryPublishedMessage { get { @@ -1096,16 +844,7 @@ public static string RepositoryPublishedMessage { } /// - /// 查找类似 Request changes 的本地化字符串。 - /// - public static string RequestChanges { - get { - return ResourceManager.GetString("RequestChanges", resourceCulture); - } - } - - /// - /// 查找类似 Resend 的本地化字符串。 + /// Looks up a localized string similar to Resend. /// public static string resendCodeButtonContent { get { @@ -1114,7 +853,7 @@ public static string resendCodeButtonContent { } /// - /// 查找类似 Send the code to your registered SMS Device again 的本地化字符串。 + /// Looks up a localized string similar to Send the code to your registered SMS Device again. /// public static string resendCodeButtonToolTip { get { @@ -1123,7 +862,7 @@ public static string resendCodeButtonToolTip { } /// - /// 查找类似 Reviewers 的本地化字符串。 + /// Looks up a localized string similar to Reviewers. /// public static string Reviewers { get { @@ -1132,16 +871,7 @@ public static string Reviewers { } /// - /// 查找类似 Select Fork 的本地化字符串。 - /// - public static string SelectFork { - get { - return ResourceManager.GetString("SelectFork", resourceCulture); - } - } - - /// - /// 查找类似 Sign in... 的本地化字符串。 + /// Looks up a localized string similar to Sign in.... /// public static string SignInCallToAction { get { @@ -1150,7 +880,7 @@ public static string SignInCallToAction { } /// - /// 查找类似 Sign in 的本地化字符串。 + /// Looks up a localized string similar to Sign in. /// public static string SignInLink { get { @@ -1159,25 +889,7 @@ public static string SignInLink { } /// - /// 查找类似 Sign in to GitHub 的本地化字符串。 - /// - public static string SignInToGitHub { - get { - return ResourceManager.GetString("SignInToGitHub", resourceCulture); - } - } - - /// - /// 查找类似 Sign in with your browser 的本地化字符串。 - /// - public static string SignInWithYourBrowser { - get { - return ResourceManager.GetString("SignInWithYourBrowser", resourceCulture); - } - } - - /// - /// 查找类似 Sign out 的本地化字符串。 + /// Looks up a localized string similar to Sign out. /// public static string SignOutLink { get { @@ -1186,7 +898,7 @@ public static string SignOutLink { } /// - /// 查找类似 Sign up 的本地化字符串。 + /// Looks up a localized string similar to Sign up. /// public static string SignUpLink { get { @@ -1195,25 +907,7 @@ public static string SignUpLink { } /// - /// 查找类似 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 的本地化字符串。 + /// Looks up a localized string similar to Switch to List View. /// public static string SwitchToListView { get { @@ -1222,7 +916,7 @@ public static string SwitchToListView { } /// - /// 查找类似 Switch to Tree View 的本地化字符串。 + /// Looks up a localized string similar to Switch to Tree View. /// public static string SwitchToTreeView { get { @@ -1231,18 +925,9 @@ public static string SwitchToTreeView { } /// - /// 查找类似 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)? + /// 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)? /// - ///[Don't show this again](dont-show-again) 的本地化字符串。 + ///[Don't show this again](dont-show-again). /// public static string TeamExplorerWelcomeMessage { get { @@ -1251,16 +936,7 @@ public static string TeamExplorerWelcomeMessage { } /// - /// 查找类似 There aren't any open pull requests 的本地化字符串。 - /// - public static string ThereArenTAnyOpenPullRequests { - get { - return ResourceManager.GetString("ThereArenTAnyOpenPullRequests", resourceCulture); - } - } - - /// - /// 查找类似 Title (required) 的本地化字符串。 + /// Looks up a localized string similar to Title (required). /// public static string TitleRequired { get { @@ -1269,16 +945,7 @@ public static string TitleRequired { } /// - /// 查找类似 To get started you can 的本地化字符串。 - /// - public static string ToGetStartedYouCan { - get { - return ResourceManager.GetString("ToGetStartedYouCan", resourceCulture); - } - } - - /// - /// 查找类似 Token 的本地化字符串。 + /// Looks up a localized string similar to Token. /// public static string TokenPrompt { get { @@ -1287,16 +954,7 @@ public static string TokenPrompt { } /// - /// 查找类似 to point to 的本地化字符串。 - /// - public static string ToPointTo { - get { - return ResourceManager.GetString("ToPointTo", resourceCulture); - } - } - - /// - /// 查找类似 Two-factor authentication 的本地化字符串。 + /// Looks up a localized string similar to Two-factor authentication. /// public static string twoFactorAuthText { get { @@ -1305,16 +963,7 @@ public static string twoFactorAuthText { } /// - /// 查找类似 Couldn't open from '{0}'. Only URLs that link to repository files are currently supported. 的本地化字符串。 - /// - public static string UnknownLinkTypeMessage { - get { - return ResourceManager.GetString("UnknownLinkTypeMessage", resourceCulture); - } - } - - /// - /// 查找类似 Update comment 的本地化字符串。 + /// Looks up a localized string similar to Update comment. /// public static string UpdateComment { get { @@ -1323,7 +972,7 @@ public static string UpdateComment { } /// - /// 查找类似 updated {0} 的本地化字符串。 + /// Looks up a localized string similar to updated {0}. /// public static string UpdatedFormat { get { @@ -1332,16 +981,7 @@ public static string UpdatedFormat { } /// - /// 查找类似 Update your local repository's 的本地化字符串。 - /// - public static string UpdateYourLocalRepositoryS { - get { - return ResourceManager.GetString("UpdateYourLocalRepositoryS", resourceCulture); - } - } - - /// - /// 查找类似 Username or email 的本地化字符串。 + /// Looks up a localized string similar to Username or email. /// public static string UserNameOrEmailPromptText { get { @@ -1350,7 +990,7 @@ public static string UserNameOrEmailPromptText { } /// - /// 查找类似 Verify 的本地化字符串。 + /// Looks up a localized string similar to Verify. /// public static string verifyText { get { @@ -1359,7 +999,7 @@ public static string verifyText { } /// - /// 查找类似 View Changes 的本地化字符串。 + /// Looks up a localized string similar to View Changes. /// public static string ViewChanges { get { @@ -1368,7 +1008,7 @@ public static string ViewChanges { } /// - /// 查找类似 View Changes in Solution 的本地化字符串。 + /// Looks up a localized string similar to View Changes in Solution. /// public static string ViewChangesInSolution { get { @@ -1377,16 +1017,7 @@ public static string ViewChangesInSolution { } /// - /// 查找类似 View, Checkout or Create a Pull request 的本地化字符串。 - /// - public static string ViewCheckoutOrCreateAPullRequest { - get { - return ResourceManager.GetString("ViewCheckoutOrCreateAPullRequest", resourceCulture); - } - } - - /// - /// 查找类似 View File 的本地化字符串。 + /// Looks up a localized string similar to View File. /// public static string ViewFile { get { @@ -1395,39 +1026,12 @@ public static string ViewFile { } /// - /// 查找类似 Wiki 的本地化字符串。 + /// Looks up a localized string similar to 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 deleted file mode 100644 index 6a9d93e249..0000000000 --- a/src/GitHub.VisualStudio.UI/Resources.en-US.resx +++ /dev/null @@ -1,578 +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 - - - 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 - - - Cancel - - - Pending - - - Start a review - - - You must commit and push your changes to add a comment here. - - - Previous Comment - - - Next Comment - - - View, Checkout or Create a Pull request - - - Back - - - Fork Repository - - - Fork the repository - - - Update your local repository's - - - to point to - - - Create pull request - - - Sign in to GitHub - - - Pull - - - Push - - - Sync - - - wrote - - - Submit your review for - - - Your review summary - - - Comment only - - - Approve - - - Request changes - - - Comments - - - Outdated comments - - - Create New - - - Assignee - - - Author - - - Sign in with your browser - - - Open - - - Filter by Author - - - Select Fork - - - There aren't any open pull requests - - - Pull requests let you tell others about changes you've pushed to a repository on GitHub - - - No results matched your search. - - - To get started you can - - - create a pull request - - - 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.resx b/src/GitHub.VisualStudio.UI/Resources.resx index e0085724be..c7665ec8e8 100644 --- a/src/GitHub.VisualStudio.UI/Resources.resx +++ b/src/GitHub.VisualStudio.UI/Resources.resx @@ -434,145 +434,13 @@ Update comment - - Cancel - - - Pending - - - Start a review - - - You must commit and push your changes to add a comment here. - - - Previous Comment - - - Next Comment - - - View, Checkout or Create a Pull request - - - Back - - - Fork Repository - - - Fork the repository - - - Update your local repository's - - - to point to - - - Create pull request - - - Sign in to GitHub - - - Pull - - - Push - - - Sync - - - wrote - - - Submit your review for - - - Your review summary - - - Comment only - - - Approve - - - Request changes - - - Comments - - - Outdated comments - - - Create New - - - Assignee - - - Author - - - Sign in with your browser - Open - - Filter by Author - - - Select Fork - Are you sure you want to delete this comment? Delete Comment - - There aren't any open pull requests - - - Pull requests let you tell others about changes you've pushed to a repository on GitHub - - - No results matched your search. - - - To get started you can - - - create a pull request - - - Open repository at '{0}'? - - - The target URL has a different owner to the current repository. - - - There is no active repository to navigate - - - This file has changed since the permalink was created - - - Please open the repository '{0}' and try again - - - Couldn't open from '{0}'. Only URLs that link to repository files are currently supported. - - - Couldn't a find a GitHub URL in clipboard - - - Couldn't find target URL in current repository. Try again after doing a fetch. - \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx b/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx deleted file mode 100644 index 7d638d095f..0000000000 --- a/src/GitHub.VisualStudio.UI/Resources.zh-Hans.resx +++ /dev/null @@ -1,578 +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 - - - 无效的验证码 - - - 尝试再次输入代码或单击【重新发送】按钮以获取新的验证码。 - - - 验证码已发送！ - - - 如果您没有收到验证码，请联系 support@github.com 。 - - - 浏览 - - - 无法连接到github.com - - - 无法连接服务器 - - - 创建 - - - 说明(可选) - - - 在浏览器中打开 - - - 取消 - - - Gist已创建 - - - 创建Gist失败 - - - 由 - - - 隐私 - - - 通过发送匿名使用数据来帮助我们改进! - - - 无法复制到剪贴板，请重试。 - - - 链接已经复制到剪贴板 - - - 版本库创建成功。 - - - 私有Gist - - - 文件名 - - - 你没有登录到 {0},因此操作可能才会失败. [立即登录]({1}) - - - 维基 - - - 动态 - - - 拉取请求 - - - 路径 - - - 问题 - - - 图表 - - - 连接... - - - 克隆 - - - 验证 - - - 双重身份验证 - - - 注册 - - - 注销 - - - 再次将验证码短信发送至您的注册手机中 - - - 重新发送 - - - 存储库名称 - - - 发布 - - - 或 - - - 在你的手机上打开双重身份验证App查看验证码。 - - - 没有存储库 - - - 名称 - - - 私有存储库 - - - 登录失败。 - - - 本地路径 - - - 许可证 - - - 了解详细信息 - - - Git忽略 - - - 搜索存储库 - - - 加载存储库时发送意外。 - - - GitHub企业服务器地址 - - - 用户名或电子邮件 - - - 密码 - - - 检查您的用户名和密码然后重试 - - - 登录 - - - 是否忘记了您的密码? - - - 请检查你的 Internet 连接，然后重试。 - - - 没有GitHub企业版？ - - - 没有帐户? - - - 标题(必须) - - - 描述 - - - 将此存储库发布到 GitHub, 并为开源和私有项目获得强大的协作、代码审阅和代码管理。 - - - 此存储库未托管至Github - - - 没有存储库 - - - 我们在这里找不到 git 存储库。打开一个 git 项目或单击项目中的 "文件"-> "添加到源代码管理" 以开始. - - - 创建帐户 - - - 筛选分支 - - - 发布到 GitHub - - - 开始 - - - 登录 - - - 登录... - - - 本地分支最新! - - - 变更:({0}） - - - 查看变更 - - - 将比较文件作为默认操作 - - - 查看文件 - - - 将打开文件作为默认操作 - - - 切换到列表视图 - - - 切换到树视图 - - - 已更新“{0}” - - - 在GitHub上查看拉取请求 - - - 已更新 - - - 在编辑器边缘显示PR注释 - - - 实验性功能 - - - 我们将在未来的版本中改变此功能。 - - - 在解决方案中查看更新 - - - 解决方案中打开文件 - - - 令牌 - - - 继续复审 - - - 添加复审 - - - 复审人员 - - - 添加复审注释 - - - 添加评论 - - - Fork - - - 正在调试 - - - 启用日志跟踪 - - - 更新注释 - - - 让您的开源和私有项目拥有强大的协作、代码审查、以及代码管理。 - - - 这个存储库没有托管至远程。填写表单，将其发布到Github。 - - - 部分或全部存储库没有加载，请关闭对话框重试。 - - - 无效主机或不是GitHub企业服务器，请检查地址并重试。 - - - 欢迎使用 GitHub for Visual Studio！ 您可以先看看这里 [培训](show-training) 或[文档](show-docs)? - -[不再显示](dont-show-again) - - - GitHub括在在Blend内部无效 - - - 在团队管理中显示【Fork】按钮 - - - 取消 - - - 挂起 - - - 开始复审 - - - 您必须提交和推送更改, 才能在此添加注释。 - - - 上一个评论 - - - 下一个评论 - - - 查看、签出或创建拉取请求 - - - 返回 - - - Fork存储库 - - - Fork此存储库 - - - 更新本地存储库的 - - - 要指向 - - - 创建拉取请求 - - - 登录GitHub - - - 拉取 - - - 推送 - - - 同步 - - - 已写 - - - 提交你的批注 - - - 你的批注概要 - - - 仅批注 - - - 批准 - - - 请求变更 - - - 批注 - - - 过期批注 - - - 创建 - - - 分配 - - - 作者 - - - 使用浏览器登录 - - - 打开 - - - 按作者过滤 - - - 选择Fork - - - 这里没有任何打开的推送请求 - - - 通过推送请求告诉其他人关于你推送到一个GitHub存储库的变更 - - - 您的搜索没有匹配结果 - - - 现在开始你可以 - - - 创建拉取请求 - - - 在“{0}”打开存储库? - - - 目标URL与当前存储库拥有者不同。 - - - 没有活动的存储库可以导航 - - - 自创建固定链接以来，此文件已更改！ - - - 请打开存储库“{0}”，然后重试！ - - - 无法从“{0}”打开。目前仅支持链接到存储库文件的URL。 - - - 无法在剪贴板中找到GitHub网址！ - - - 无法在当前存储库中找到目标URL。在进行提取后再试一次。 - - - 删除注释 - - - 您确定要删除此注释吗? - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs index 7476a6eb58..7e824c62a1 100644 --- a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs +++ b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs @@ -4,7 +4,6 @@ using GitHub.Exports; using GitHub.Services; using GitHub.Services.Vssdk.Commands; -using GitHub.VisualStudio.UI; using Microsoft.VisualStudio.Shell; using Task = System.Threading.Tasks.Task; @@ -13,7 +12,13 @@ namespace GitHub.VisualStudio.Commands [Export(typeof(IOpenFromClipboardCommand))] public class OpenFromClipboardCommand : VsCommand, IOpenFromClipboardCommand { - + public const string NoGitHubUrlMessage = "Couldn't a find a GitHub URL in clipboard"; + public const string NoResolveSameOwnerMessage = "Couldn't find target URL in current repository. Try again after doing a fetch."; + public const string NoResolveDifferentOwnerMessage = "The target URL has a different owner to the current repository."; + public const string NoActiveRepositoryMessage = "There is no active repository to navigate"; + public const string ChangesInWorkingDirectoryMessage = "This file has changed since the permalink was created"; + public const string DifferentRepositoryMessage = "Please open the repository '{0}' and try again"; + public const string UnknownLinkTypeMessage = "Couldn't open from '{0}'. Only URLs that link to repository files are currently supported."; readonly Lazy gitHubContextService; readonly Lazy teamExplorerContext; @@ -53,13 +58,13 @@ public override async Task Execute(string url) var context = gitHubContextService.Value.FindContextFromClipboard(); if (context == null) { - vsServices.Value.ShowMessageBoxInfo(Resources.NoGitHubUrlMessage); + vsServices.Value.ShowMessageBoxInfo(NoGitHubUrlMessage); return; } if (context.LinkType != LinkType.Blob) { - var message = string.Format(Resources.UnknownLinkTypeMessage, context.Url); + var message = string.Format(UnknownLinkTypeMessage, context.Url); vsServices.Value.ShowMessageBoxInfo(message); return; } @@ -68,13 +73,13 @@ public override async Task Execute(string url) var repositoryDir = activeRepository?.LocalPath; if (repositoryDir == null) { - vsServices.Value.ShowMessageBoxInfo(Resources.NoActiveRepositoryMessage); + vsServices.Value.ShowMessageBoxInfo(NoActiveRepositoryMessage); return; } if (!string.Equals(activeRepository.Name, context.RepositoryName, StringComparison.OrdinalIgnoreCase)) { - vsServices.Value.ShowMessageBoxInfo(string.Format(Resources.DifferentRepositoryMessage, context.RepositoryName)); + vsServices.Value.ShowMessageBoxInfo(string.Format(DifferentRepositoryMessage, context.RepositoryName)); return; } @@ -83,11 +88,11 @@ public override async Task Execute(string url) { if (!string.Equals(activeRepository.Owner, context.Owner, StringComparison.OrdinalIgnoreCase)) { - vsServices.Value.ShowMessageBoxInfo(Resources.NoResolveDifferentOwnerMessage); + vsServices.Value.ShowMessageBoxInfo(NoResolveDifferentOwnerMessage); } else { - vsServices.Value.ShowMessageBoxInfo(Resources.NoResolveSameOwnerMessage); + vsServices.Value.ShowMessageBoxInfo(NoResolveSameOwnerMessage); } return; @@ -104,7 +109,7 @@ public override async Task Execute(string url) return; } - vsServices.Value.ShowMessageBoxInfo(Resources.ChangesInWorkingDirectoryMessage); + vsServices.Value.ShowMessageBoxInfo(ChangesInWorkingDirectoryMessage); } gitHubContextService.Value.TryOpenFile(repositoryDir, context); diff --git a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs index 62ddaa8bc2..23e64442e5 100644 --- a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs +++ b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs @@ -12,7 +12,6 @@ using Microsoft.VisualStudio.Shell.Interop; using Task = System.Threading.Tasks.Task; using SVsServiceProvider = Microsoft.VisualStudio.Shell.SVsServiceProvider; -using GitHub.VisualStudio.UI; namespace GitHub.VisualStudio.Commands { @@ -120,7 +119,7 @@ public override async Task Execute(string url) var solutionDir = FindSolutionDirectory(dte.Value.Solution); if (solutionDir == null || !ContainsDirectory(repositoryDir, solutionDir)) { - var result = ShowInfoMessage(string.Format(Resources.OpenRepositoryAtDir, repositoryDir)); + var result = ShowInfoMessage($"Open repository at '{repositoryDir}'?"); switch (result) { case VSConstants.MessageBoxResult.IDYES: diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 9be12f78af..7ff26a878d 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -19,8 +19,6 @@ GitHub\GitHub - en-US - true @@ -43,12 +41,6 @@ true true true - true - true - true - true - true - false true @@ -462,34 +454,13 @@ - - true - VSPackage.en-US.Resources - VSPackage.resx - - + true VSPackage Designer - - - true - VSPackage.zh-Hans.resources - VSPackage.resx - - Designer - - - Menus.ctmenu - GitHub.VisualStudio.vsct - - - Menus.ctmenu - GitHub.VisualStudio.vsct - PreserveNewest true @@ -519,6 +490,12 @@ + + + Menus.ctmenu + Designer + + Properties\CodeAnalysisDictionary.xml @@ -706,16 +683,22 @@ {600998c4-54dd-4755-bfa8-6f44544d8e2e} ReactiveUI.Events_Net45 True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {1ce2d235-8072-4649-ba5a-cfb1af8776e0} ReactiveUI_Net45 True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {252ce1c2-027a-4445-a3c2-e4d6c80a935a} Splat-Net45 True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {41a47c5b-c606-45b4-b83c-22b9239e4da0} @@ -726,31 +709,43 @@ {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {1a1da411-8d1f-4578-80a6-04576bea2dc5} GitHub.App True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} GitHub.Exports.Reactive True + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bDebugSymbolsProjectOutputGroup%3bBuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b {9aea02db-02b5-409c-b0ca-115d05331a6b} GitHub.Exports True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {6559e128-8b40-49a5-85a8-05565ed0c7e3} GitHub.Extensions.Reactive True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} GitHub.Extensions True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {8d73575a-a89f-47cc-b153-b47dd06837f0} @@ -760,6 +755,8 @@ {7f5ed78b-74a3-4406-a299-70cfb5885b8b} GitHub.InlineReviews True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup + DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup {2d3d2834-33be-45ca-b3cc-12f853557d7b} @@ -769,33 +766,45 @@ {50e277b8-8580-487a-8f8e-5c3b9fbf0f77} GitHub.StartPage True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup + DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup {161dbf01-1dbf-4b00-8551-c5c00f26720d} GitHub.TeamFoundation.14 True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; TF14 {161dbf01-1dbf-4b00-8551-c5c00f26720e} GitHub.TeamFoundation.15 True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; TF15 {158b05e8-fdbc-4d71-b871-c96e28d5adf5} GitHub.UI.Reactive True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {346384dd-2445-4a28-af22-b45f3957bd89} GitHub.UI True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; {d1dfbb0c-b570-4302-8f1e-2e3a19c41961} GitHub.VisualStudio.UI True + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; + DebugSymbolsProjectOutputGroup; diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct b/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct deleted file mode 100644 index 33706b5866..0000000000 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.en-US.vsct +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - 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 a45cb98b8c..4a5900e8e1 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct @@ -24,7 +24,260 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 deleted file mode 100644 index b9b9efc019..0000000000 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.zh-Hans.vsct +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - WindowToolBar - Window Toolbar - - - - - - GitHub - GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs index fa49858c11..9b8e052f21 100644 --- a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs +++ b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs @@ -1,13 +1,12 @@ using System; using System.Reflection; -using System.Resources; using System.Runtime.InteropServices; using System.Windows.Markup; [assembly: AssemblyTitle("GitHub.VisualStudio")] [assembly: AssemblyDescription("GitHub for Visual Studio VSPackage")] [assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")] -[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")] diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs new file mode 100644 index 0000000000..a224bebbd7 --- /dev/null +++ b/src/GitHub.VisualStudio/Resources.Designer.cs @@ -0,0 +1,603 @@ +//------------------------------------------------------------------------------ +// +// 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 018ffe5367..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 - - - A Visual Studio Extension that brings the GitHub Flow into 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 62613497a4..0477774a24 100644 --- a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml +++ b/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml @@ -5,7 +5,6 @@ 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" @@ -54,8 +53,9 @@ + - + Fork the repository @@ -66,7 +66,7 @@ - origin + Update your local repository's origin to point to @@ -93,8 +93,8 @@ Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}" HorizontalAlignment="Left" /> - - + + diff --git a/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml b/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml index 5d0da196b7..7b4ad8418e 100644 --- a/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml +++ b/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml @@ -109,7 +109,7 @@ - + Sign in with your browser @@ -186,11 +186,11 @@ - + or - + Sign in with your browser diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml index dd40378b7c..a3582715e8 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="{x:Static prop:Resources.SignInToGitHub}" /> + Content="Sign in to GitHub" /> + Text="Powerful collaboration, code review, and code management for open source and private projects." />