From 0e87980b1f2acb63e9648f192f59a646330d2b87 Mon Sep 17 00:00:00 2001 From: chriswang521 Date: Wed, 15 May 2024 18:16:15 +0800 Subject: [PATCH] =?UTF-8?q?fixed:[scm]=E7=A7=BB=E9=99=A4Git=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E5=A4=96=E9=83=A8=E5=B8=AE=E5=8A=A9=E9=93=BE?= =?UTF-8?q?=E6=8E=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/git/package.json | 6 ----- extensions/git/package.nls.json | 27 +++++++++---------- .../extensions/vscode.git.i18n.json | 23 ++++++++-------- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index 5f2acfa8..210cea31 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -3053,12 +3053,6 @@ "contents": "%view.workbench.cloneRepository%", "when": "config.git.enabled && git.state == initialized && scm.providerCount == 0", "group": "5_scm@1" - }, - { - "view": "explorer", - "contents": "%view.workbench.learnMore%", - "when": "config.git.enabled && git.state == initialized && scm.providerCount == 0", - "group": "5_scm@10" } ] }, diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 011c6056..70e16ab2 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -306,9 +306,9 @@ "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] }, - "view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).", + "view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others.", "view.workbench.scm.disabled": { - "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\n", "comment": [ "{Locked='](command:workbench.action.openSettings?%5B%22git.enabled%22%5D'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -316,7 +316,7 @@ ] }, "view.workbench.scm.empty": { - "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\n", "comment": [ "{Locked='](command:vscode.openFolder'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -324,7 +324,7 @@ ] }, "view.workbench.scm.folder": { - "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\n", "comment": [ "{Locked='](command:git.init?%5Btrue%5D'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -332,7 +332,7 @@ ] }, "view.workbench.scm.workspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\n", "comment": [ "{Locked='](command:git.init'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -340,7 +340,7 @@ ] }, "view.workbench.scm.emptyWorkspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\n", "comment": [ "{Locked='](command:workbench.action.addRootFolder'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -354,7 +354,7 @@ "message": "Scanning workspace for Git repositories..." }, "view.workbench.scm.repositoryInParentFolders": { - "message": "A Git repository was found in the parent folders of the workspace or the open file(s).\n[Open Repository](command:git.openRepositoriesInParentFolders)\nUse the [git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D) setting to control whether Git repositories in parent folders of workspaces or open files are opened. To learn more [read our docs](https://aka.ms/vscode-git-repository-in-parent-folders).", + "message": "A Git repository was found in the parent folders of the workspace or the open file(s).\n[Open Repository](command:git.openRepositoriesInParentFolders)\nUse the [git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D) setting to control whether Git repositories in parent folders of workspaces or open files are opened. ", "comment": [ "{Locked='](command:git.openRepositoriesInParentFolders'}", "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", @@ -363,7 +363,7 @@ ] }, "view.workbench.scm.repositoriesInParentFolders": { - "message": "Git repositories were found in the parent folders of the workspace or the open file(s).\n[Open Repository](command:git.openRepositoriesInParentFolders)\nUse the [git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D) setting to control whether Git repositories in parent folders of workspace or open files are opened. To learn more [read our docs](https://aka.ms/vscode-git-repository-in-parent-folders).", + "message": "Git repositories were found in the parent folders of the workspace or the open file(s).\n[Open Repository](command:git.openRepositoriesInParentFolders)\nUse the [git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D) setting to control whether Git repositories in parent folders of workspace or open files are opened. ", "comment": [ "{Locked='](command:git.openRepositoriesInParentFolders'}", "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", @@ -372,7 +372,7 @@ ] }, "view.workbench.scm.unsafeRepository": { - "message": "The detected Git repository is potentially unsafe as the folder is owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).", + "message": "The detected Git repository is potentially unsafe as the folder is owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\n", "comment": [ "{Locked='](command:git.manageUnsafeRepositories'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -380,7 +380,7 @@ ] }, "view.workbench.scm.unsafeRepositories": { - "message": "The detected Git repositories are potentially unsafe as the folders are owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).", + "message": "The detected Git repositories are potentially unsafe as the folders are owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\n", "comment": [ "{Locked='](command:git.manageUnsafeRepositories'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -388,7 +388,7 @@ ] }, "view.workbench.scm.closedRepository": { - "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\n", "comment": [ "{Locked='](command:git.reopenClosedRepositories'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -396,7 +396,7 @@ ] }, "view.workbench.scm.closedRepositories": { - "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm).", + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\n", "comment": [ "{Locked='](command:git.reopenClosedRepositories'}", "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", @@ -410,6 +410,5 @@ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Kylin-Code", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] - }, - "view.workbench.learnMore": "To learn more about how to use Git and source control in Kylin-Code [read our docs](https://aka.ms/vscode-scm)." + } } diff --git a/extensions/vscode-language-pack-zh-hans/translations/extensions/vscode.git.i18n.json b/extensions/vscode-language-pack-zh-hans/translations/extensions/vscode.git.i18n.json index c59215e0..bcbf7c47 100644 --- a/extensions/vscode-language-pack-zh-hans/translations/extensions/vscode.git.i18n.json +++ b/extensions/vscode-language-pack-zh-hans/translations/extensions/vscode.git.i18n.json @@ -600,24 +600,23 @@ "submenu.stash": "存储", "submenu.tags": "标记", "view.workbench.cloneRepository": "可以在本地克隆仓库。\r\n[克隆仓库](command:git.clone '启用 Git 扩展后立即克隆仓库')", - "view.workbench.learnMore": "若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.closedRepositories": "找到以前关闭的 Git 存储库。\r\n[重新打开已关闭的存储库](command:git.reopenClosedRepositories)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.closedRepository": "找到以前关闭的 Git 存储库。\r\n[重新打开已关闭的存储库](command:git.reopenClosedRepositories)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.disabled": "如果要使用 Git 功能，请在[设置](command:workbench.action.openSettings?%5B%22git.enabled%22%5D)中启用 Git。\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.empty": "为了使用 Git 功能，可打开包含 Git 仓库的文件夹或从 URL 克隆。\r\n[打开文件夹](command:vscode.openFolder)\r\n[克隆仓库](command:git.clone)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.emptyWorkspace": "当前打开的工作区中没有任何包含 Git 仓库的文件夹。\r\n[将文件夹添加到工作区](command:workbench.action.addRootFolder)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", - "view.workbench.scm.folder": "当前打开的文件夹中没有 Git 存储库。可初始化一个仓库，它将实现 Git 提供支持的源代码管理功能。\r\n[初始化仓库](command:git.init?%5Btrue%5D)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。", + "view.workbench.scm.closedRepositories": "找到以前关闭的 Git 存储库。\r\n[重新打开已关闭的存储库](command:git.reopenClosedRepositories)\r\n", + "view.workbench.scm.closedRepository": "找到以前关闭的 Git 存储库。\r\n[重新打开已关闭的存储库](command:git.reopenClosedRepositories)\r\n", + "view.workbench.scm.disabled": "如果要使用 Git 功能，请在[设置](command:workbench.action.openSettings?%5B%22git.enabled%22%5D)中启用 Git。\r\n", + "view.workbench.scm.empty": "为了使用 Git 功能，可打开包含 Git 仓库的文件夹或从 URL 克隆。\r\n[打开文件夹](command:vscode.openFolder)\r\n[克隆仓库](command:git.clone)\r\n", + "view.workbench.scm.emptyWorkspace": "当前打开的工作区中没有任何包含 Git 仓库的文件夹。\r\n[将文件夹添加到工作区](command:workbench.action.addRootFolder)\r\n", + "view.workbench.scm.folder": "当前打开的文件夹中没有 Git 存储库。可初始化一个仓库，它将实现 Git 提供支持的源代码管理功能。\r\n[初始化仓库](command:git.init?%5Btrue%5D)\r\n", "view.workbench.scm.missing": "安装 Git (一种流行的源代码管理系统)，以跟踪代码更改并与他人协作。在我们的 [Git 指南](https://aka.ms/vscode-scm)中了解详细信息。", "view.workbench.scm.missing.linux": "源代码管理取决于将安装的 Git。\r\n[下载适用于 Linux 的 Git](https://git-scm.com/download/linux)\r\n安装后，请[重新加载](command:workbench.action.reloadWindow) (或[执行故障排除](command:git.showOutput))。可以[从商城]](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22)安装其他源代码管理提供程序。", "view.workbench.scm.missing.mac": "[下载适用于 macOS 的 Git](https://git-scm.com/download/mac)\r\n安装后，请[重新加载](command:workbench.action.reloadWindow) (或[执行故障排除](command:git.showOutput))。可以[从商城](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22)安装其他源代码管理提供程序。", "view.workbench.scm.missing.windows": "[下载适用于 Windows 的 Git](https://git-scm.com/download/win)\r\n安装后，请[重新加载](command:workbench.action.reloadWindow) (或[执行故障排除](command:git.showOutput))。可以[从商城](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22)安装其他源代码管理提供程序。", - "view.workbench.scm.repositoriesInParentFolders": "在工作区的父文件夹或打开的文件中找到了 Git 存储库。\r\n[打开存储库](command:git.openRepositoriesInParentFolders)\r\n使用[git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D)设置来控制是打开工作区或打开文件的父文件夹中的 Git 存储库。若要了解详细信息，请[阅读我们的文档](https://aka.ms/vscode-git-repository-in-parent-folders)。", - "view.workbench.scm.repositoryInParentFolders": "在工作区的父文件夹或打开的文件中找到了 Git 存储库。\r\n[打开存储库](command:git.openRepositoriesInParentFolders)\r\n使用[git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D)设置来控制是打开工作区或打开文件的父文件夹中的 Git 存储库。若要了解详细信息，请[阅读我们的文档](https://aka.ms/vscode-git-repository-in-parent-folders)。", + "view.workbench.scm.repositoriesInParentFolders": "在工作区的父文件夹或打开的文件中找到了 Git 存储库。\r\n[打开存储库](command:git.openRepositoriesInParentFolders)\r\n使用[git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D)设置来控制是打开工作区或打开文件的父文件夹中的 Git 存储库。", + "view.workbench.scm.repositoryInParentFolders": "在工作区的父文件夹或打开的文件中找到了 Git 存储库。\r\n[打开存储库](command:git.openRepositoriesInParentFolders)\r\n使用[git.openRepositoryInParentFolders](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D)设置来控制是打开工作区或打开文件的父文件夹中的 Git 存储库。", "view.workbench.scm.scanFolderForRepositories": "正在扫描 Git 存储库的文件夹...", "view.workbench.scm.scanWorkspaceForRepositories": "正在扫描工作区中的 Git 存储库...", - "view.workbench.scm.unsafeRepositories": "检测到的 Git 存储库可能不安全，因为该文件夹由当前用户以外的其他人所有。\r\n[管理不安全存储库](command:git.manageUnsafeRepositories)\r\n要详细了解不安全存储库，[请阅读我们的文档](https://aka.ms/vscode-git-unsafe-repository)。", - "view.workbench.scm.unsafeRepository": "检测到的 Git 存储库可能不安全，因为该文件夹由当前用户以外的其他人所有。\r\n[管理不安全存储库](command:git.manageUnsafeRepositories)\r\n要详细了解不安全存储库，[请阅读我们的文档](https://aka.ms/vscode-git-unsafe-repository)。", - "view.workbench.scm.workspace": "当前打开的工作区中没有任何包含 Git 仓库的文件夹。可初始化某文件夹上的一个仓库，该仓库将实现 Git 提供支持的源代码管理功能。\r\n[初始化仓库](command:git.init)\r\n若要详细了解如何在 Kylin-Code 中使用 Git 和源代码管理[参阅我们的文档](https://aka.ms/vscode-scm)。" + "view.workbench.scm.unsafeRepositories": "检测到的 Git 存储库可能不安全，因为该文件夹由当前用户以外的其他人所有。\r\n[管理不安全存储库](command:git.manageUnsafeRepositories)\r\n", + "view.workbench.scm.unsafeRepository": "检测到的 Git 存储库可能不安全，因为该文件夹由当前用户以外的其他人所有。\r\n[管理不安全存储库](command:git.manageUnsafeRepositories)\r\n", + "view.workbench.scm.workspace": "当前打开的工作区中没有任何包含 Git 仓库的文件夹。可初始化某文件夹上的一个仓库，该仓库将实现 Git 提供支持的源代码管理功能。\r\n[初始化仓库](command:git.init)\r\n" } } }