From 4271e8d69adcee5fafb4835116b2cf7126fb7d48 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 18 Sep 2018 13:25:23 +0200 Subject: [PATCH 01/12] Added XliffTasks package. --- nuget.config | 1 + .../GitHub.VisualStudio.csproj | 30 +++++++++++++++++++ src/GitHub.VisualStudio/packages.config | 1 + 3 files changed, 32 insertions(+) diff --git a/nuget.config b/nuget.config index f9e15995d3..e0f4529ac1 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,7 @@ + diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index f459410743..b554a12550 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -1,5 +1,6 @@  + @@ -867,8 +868,37 @@ + + + + + + <_GeneratedCTOFilesWithCulture Include="@(_GeneratedCTOFilesWithNoCulture)"> + en + true + + <_GeneratedCTOFilesWithNoCulture Remove="@(_GeneratedCTOFilesWithNoCulture)" /> + <_ResourcesToMergeWithCTOWithCultureMetadata Condition="'%(WithCulture)' != 'true'"> + en + true + + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config index 25b3a34c75..e092a7fc4e 100644 --- a/src/GitHub.VisualStudio/packages.config +++ b/src/GitHub.VisualStudio/packages.config @@ -53,4 +53,5 @@ + \ No newline at end of file From 1ac8fd87822b22ea82ee9e689c431376a08df978 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 18 Sep 2018 13:51:49 +0200 Subject: [PATCH 02/12] Added zh-CN xlf files. --- .../GitHub.VisualStudio.csproj | 1 + .../xlf/GitHub.VisualStudio.vsct.zh-CN.xlf | 207 ++++++++++++++++++ .../xlf/VSPackage.zh-CN.xlf | 17 ++ 3 files changed, 225 insertions(+) create mode 100644 src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf create mode 100644 src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index b554a12550..edba458daa 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -18,6 +18,7 @@ v3 false GitHub\GitHub + zh-CN diff --git a/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf new file mode 100644 index 0000000000..76c9885550 --- /dev/null +++ b/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf @@ -0,0 +1,207 @@ + + + + + + &Connect to GitHub + &Connect to GitHub + + + + .GitHub.ConnectToGitHub + .GitHub.ConnectToGitHub + + + + Back + Back + + + + .GitHub.Back + .GitHub.Back + + + + Copy link to clipboard + Copy link to clipboard + + + + .GitHub.CopyLink + .GitHub.CopyLink + + + + Forward + Forward + + + + .GitHub.Forward + .GitHub.Forward + + + + View on GitHub + View on GitHub + + + + .GitHub.ViewOnGitHub + .GitHub.ViewOnGitHub + + + + Go To Solution/PR File + Go To Solution/PR File + + + + .GitHub.GoToSolutionOrPRFile + .GitHub.GoToSolutionOrPRFile + + + + Help + Help + + + + .GitHub.Help + .GitHub.Help + + + + Blame + Blame + + + + .GitHub.Blame + .GitHub.Blame + + + + Create a GitHub Gist + Create a GitHub Gist + + + + .GitHub.CreateGist + .GitHub.CreateGist + + + + Create an Enterprise Gist + Create an Enterprise Gist + + + + .GitHub.CreateGistEnterprise + .GitHub.CreateGistEnterprise + + + + GitHub + GitHub + + + + GitHub + GitHub + + + + WindowToolBar + WindowToolBar + + + + Window Toolbar + Window Toolbar + + + + Open from clipboard + Open from clipboard + + + + .GitHub.OpenFromClipboard + .GitHub.OpenFromClipboard + + + + Open from GitHub... + Open from GitHub... + + + + .GitHub.OpenFromUrl + .GitHub.OpenFromUrl + + + + Open on GitHub + Open on GitHub + + + + .GitHub.OpenLink + .GitHub.OpenLink + + + + Pull Requests + Pull Requests + + + + .GitHub.PullRequests + .GitHub.PullRequests + + + + Refresh + Refresh + + + + .GitHub.Refresh + .GitHub.Refresh + + + + Show Current Pull Request + Show Current Pull Request + + + + .GitHub.ShowCurrentPullRequest + .GitHub.ShowCurrentPullRequest + + + + GitHub + GitHub + + + + .GitHub.ShowGitHubPane + .GitHub.ShowGitHubPane + + + + Sync Submodules + Sync Submodules + + + + .GitHub.SyncSubmodules + .GitHub.SyncSubmodules + + + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf new file mode 100644 index 0000000000..69c9ec046b --- /dev/null +++ b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf @@ -0,0 +1,17 @@ + + + + + + GitHub.VisualStudio + GitHub.VisualStudio + + + + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + + + + + \ No newline at end of file From 7f95625fa4ca041703ed8b1f4e2df53da4aed086 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 18 Sep 2018 13:52:03 +0200 Subject: [PATCH 03/12] Added xlf files to crowdin.yml. --- crowdin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crowdin.yml b/crowdin.yml index 08246171e4..b31345f12d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,5 @@ files: - source: /src/GitHub.Resources/Resources.resx translation: /%original_path%/Resources.%locale%.resx + - source: /**/xlf/*.xlf + translation: /**/%original_file_name% From a1ebfd863e7489584d4d05326fad6d1b41bd5349 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 19 Sep 2018 11:48:22 +0200 Subject: [PATCH 04/12] Updated crowdin.yml. Use the `zh-CN` file as the source, and upload it to crowdin as `/GitHub.VisualStudio.xlf` as advised by Andriy Poznakhovskyy at crowdin. --- crowdin.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crowdin.yml b/crowdin.yml index b31345f12d..9d5789c5ab 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,5 +1,6 @@ files: - source: /src/GitHub.Resources/Resources.resx translation: /%original_path%/Resources.%locale%.resx - - source: /**/xlf/*.xlf - translation: /**/%original_file_name% + - source: /src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf + translation: /%original_path%/GitHub.VisualStudio.%locale%.xlf + dest: /GitHub.VisualStudio.xlf \ No newline at end of file From 6de49e915f84e0d38fe13e332385aa3788a80520 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 19 Sep 2018 13:26:32 +0200 Subject: [PATCH 05/12] Added missing extension. --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 9d5789c5ab..0bd58cab19 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -2,5 +2,5 @@ files: - source: /src/GitHub.Resources/Resources.resx translation: /%original_path%/Resources.%locale%.resx - source: /src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf - translation: /%original_path%/GitHub.VisualStudio.%locale%.xlf + translation: /%original_path%/GitHub.VisualStudio.vsct.%locale%.xlf dest: /GitHub.VisualStudio.xlf \ No newline at end of file From 153eccc47a1785de8de582e6dae4ce36c969dd58 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 19 Sep 2018 13:47:46 +0200 Subject: [PATCH 06/12] Added preserve_hierachy. --- crowdin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 0bd58cab19..bdb7dc1f75 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,6 +1,7 @@ +preserve_hierarchy: true + files: - source: /src/GitHub.Resources/Resources.resx translation: /%original_path%/Resources.%locale%.resx - source: /src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf translation: /%original_path%/GitHub.VisualStudio.vsct.%locale%.xlf - dest: /GitHub.VisualStudio.xlf \ No newline at end of file From 4b72e64afe6031f43aa49030f2f90e3687f7055b Mon Sep 17 00:00:00 2001 From: EditorToolsTranslationBot <42850361+EditorToolsTranslationBot@users.noreply.github.com> Date: Wed, 19 Sep 2018 08:00:33 -0400 Subject: [PATCH 07/12] New translations GitHub.VisualStudio.vsct.zh-CN.xlf (Chinese Simplified) --- .../xlf/GitHub.VisualStudio.vsct.zh-CN.xlf | 168 +++++++++--------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf index 76c9885550..91a409ed71 100644 --- a/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf +++ b/src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf @@ -1,207 +1,207 @@ - - - + + + &Connect to GitHub - &Connect to GitHub - + 连接至GitHub(&C) + .GitHub.ConnectToGitHub - .GitHub.ConnectToGitHub - + .GitHub.ConnectToGitHub + Back - Back - + 返回 + .GitHub.Back - .GitHub.Back - + .GitHub.Back + Copy link to clipboard - Copy link to clipboard - + 复制连结到剪贴簿 + .GitHub.CopyLink - .GitHub.CopyLink - + .GitHub.CopyLink + Forward - Forward - + 转发 + .GitHub.Forward - .GitHub.Forward - + .GitHub.Forward + View on GitHub - View on GitHub - + View on GitHub + .GitHub.ViewOnGitHub - .GitHub.ViewOnGitHub - + .GitHub.ViewOnGitHub + Go To Solution/PR File - Go To Solution/PR File - + Go To Solution/PR File + .GitHub.GoToSolutionOrPRFile - .GitHub.GoToSolutionOrPRFile - + .GitHub.GoToSolutionOrPRFile + Help - Help - + 帮助 + .GitHub.Help - .GitHub.Help - + .GitHub.Help + Blame - Blame - + Blame + .GitHub.Blame - .GitHub.Blame - + .GitHub.Blame + Create a GitHub Gist - Create a GitHub Gist - + 创建一个GitHub Gist + .GitHub.CreateGist - .GitHub.CreateGist - + .GitHub.CreateGist + Create an Enterprise Gist - Create an Enterprise Gist - + Create an Enterprise Gist + .GitHub.CreateGistEnterprise - .GitHub.CreateGistEnterprise - + .GitHub.CreateGistEnterprise + GitHub - GitHub - + GitHub + GitHub - GitHub - + GitHub + WindowToolBar - WindowToolBar - + WindowToolBar + Window Toolbar - Window Toolbar - + Window Toolbar + Open from clipboard - Open from clipboard - + Open from clipboard + .GitHub.OpenFromClipboard - .GitHub.OpenFromClipboard - + .GitHub.OpenFromClipboard + Open from GitHub... - Open from GitHub... - + Open from GitHub... + .GitHub.OpenFromUrl - .GitHub.OpenFromUrl - + .GitHub.OpenFromUrl + Open on GitHub - Open on GitHub - + Open on GitHub + .GitHub.OpenLink - .GitHub.OpenLink - + .GitHub.OpenLink + Pull Requests - Pull Requests - + 拉取请求 + .GitHub.PullRequests - .GitHub.PullRequests - + .GitHub.PullRequests + Refresh - Refresh - + 刷新 + .GitHub.Refresh - .GitHub.Refresh - + .GitHub.Refresh + Show Current Pull Request - Show Current Pull Request - + 显示当前推送请求 + .GitHub.ShowCurrentPullRequest - .GitHub.ShowCurrentPullRequest - + .GitHub.ShowCurrentPullRequest + GitHub - GitHub - + GitHub + .GitHub.ShowGitHubPane - .GitHub.ShowGitHubPane - + .GitHub.ShowGitHubPane + Sync Submodules - Sync Submodules - + Sync Submodules + .GitHub.SyncSubmodules - .GitHub.SyncSubmodules - + .GitHub.SyncSubmodules + - \ No newline at end of file + From 280c1e25cdbc8ceb966c491f2e6fafc8de3bdde5 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 19 Sep 2018 14:22:47 +0200 Subject: [PATCH 08/12] Added VSPackage.xlf to be translated. --- crowdin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crowdin.yml b/crowdin.yml index bdb7dc1f75..64417011e1 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -5,3 +5,5 @@ files: translation: /%original_path%/Resources.%locale%.resx - source: /src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf translation: /%original_path%/GitHub.VisualStudio.vsct.%locale%.xlf + - source: /src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf + translation: /%original_path%/VSPackage.%locale%.xlf From c27ed82c2c7531e0dad74dc03568c343e343306e Mon Sep 17 00:00:00 2001 From: EditorToolsTranslationBot <42850361+EditorToolsTranslationBot@users.noreply.github.com> Date: Wed, 19 Sep 2018 08:23:46 -0400 Subject: [PATCH 09/12] New translations VSPackage.zh-CN.xlf (Chinese Simplified) --- src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf index 69c9ec046b..65b2442c25 100644 --- a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf +++ b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf @@ -1,17 +1,17 @@ - - - + + + GitHub.VisualStudio - GitHub.VisualStudio - + GitHub.VisualStudio + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + - \ No newline at end of file + From 83e5a635538d13c95837e3131768b90d97fbb9f1 Mon Sep 17 00:00:00 2001 From: EditorToolsTranslationBot <42850361+EditorToolsTranslationBot@users.noreply.github.com> Date: Wed, 19 Sep 2018 08:25:11 -0400 Subject: [PATCH 10/12] New translations VSPackage.zh-CN.xlf (Chinese Simplified) --- src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf index 65b2442c25..685c0e8da4 100644 --- a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf +++ b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf @@ -7,9 +7,9 @@ GitHub.VisualStudio - + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + 这是一个将GitHub工作流引入Visual Studio的扩展。 From 13a299598791a912cae9d8fc64f6d10bb1f93f84 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 19 Sep 2018 15:02:40 +0200 Subject: [PATCH 11/12] Added missing attribute. Crowdin seems to have removed this attribute, which causes an NRE in XliffTasks. Added it back in by hand for now and reported this to crowdin. --- src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf index 685c0e8da4..7eac478e35 100644 --- a/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf +++ b/src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf @@ -9,7 +9,7 @@ A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - 这是一个将GitHub工作流引入Visual Studio的扩展。 + 这是一个将GitHub工作流引入Visual Studio的扩展。 From bafea53ddd49566b1da01ad9fea2271157d11e06 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 20 Sep 2018 12:16:45 +0200 Subject: [PATCH 12/12] Fixed merge error. --- src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 0207f2ffc5..2a5bb719d7 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -859,6 +859,10 @@ + + + + @@ -892,11 +896,6 @@ - - - - -