Skip to content
Snippets Groups Projects
Unverified Commit 5ee12aba authored by 秃头灯笼鱼's avatar 秃头灯笼鱼 Committed by Hosted Weblate
Browse files

Translated using Weblate (Chinese (Simplified)) 

Currently translated at 62.2% (6936 of 11142 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/


Signed-off-by: default avatar秃头灯笼鱼 <ttdlyu@163.com>
parent 96d98afa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
po/documentation.zh_HANS-CN.po
+ 39
− 39
View file @ 5ee12aba
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# This file is distributed under the same license as the Git package. # This file is distributed under the same license as the Git package.
# Matthias Aßhauer <mha1993@live.de>, 2019. # Matthias Aßhauer <mha1993@live.de>, 2019.
msgid "" msgid ""
msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-09-24 12:59+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.1-dev\n" msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-09-27 11:02+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.1-dev\n"
   
#. type: Labeled list #. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:772 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 #: en/blame-options.txt:1 en/diff-options.txt:772 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
...@@ -56751,19 +56751,19 @@ msgstr "--follow-parent" ...@@ -56751,19 +56751,19 @@ msgstr "--follow-parent"
#: en/git-svn.txt:750 #: en/git-svn.txt:750
#, priority:100 #, priority:100
msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it." msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
msgstr "" msgstr "只有在跟踪分支的情况下（使用仓库布局选项之一 --trunk、--tags、--branches、--stdlayout），该选项才有意义。对于每个被跟踪的分支，我们会尝试找出它的修订版本是从哪里复制的，并在该分支的第一次 Git 提交中设置一个合适的父分支。 当我们跟踪的目录在版本库中被移动过时，这一点尤其有用。 如果禁用此功能，'git svn' 创建的分支将全部是线性的，不会共享任何历史记录，这意味着不会有任何关于分支被分支或合并的信息。 不过，追踪冗长/复杂的历史可能需要很长时间，所以禁用该功能可能会加快克隆过程。该功能默认为启用，使用 --no-follow-parent 可以禁用它。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:753 #: en/git-svn.txt:753
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "config key: svn.followparent\n" msgid "config key: svn.followparent\n"
msgstr "" msgstr "config key: svn.followparent\n"
   
#. type: Title - #. type: Title -
#: en/git-svn.txt:755 #: en/git-svn.txt:755
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "CONFIG FILE-ONLY OPTIONS" msgid "CONFIG FILE-ONLY OPTIONS"
msgstr "" msgstr "仅配置文件选项"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:757 #: en/git-svn.txt:757
...@@ -56775,19 +56775,19 @@ msgstr "svn.noMetadata" ...@@ -56775,19 +56775,19 @@ msgstr "svn.noMetadata"
#: en/git-svn.txt:758 #: en/git-svn.txt:758
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "svn-remote.<name>.noMetadata" msgid "svn-remote.<name>.noMetadata"
msgstr "" msgstr "svn-remote.<名称>.noMetadata"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:760 #: en/git-svn.txt:760
#, priority:100 #, priority:100
msgid "This gets rid of the 'git-svn-id:' lines at the end of every commit." msgid "This gets rid of the 'git-svn-id:' lines at the end of every commit."
msgstr "" msgstr "这样就不会在每次提交的最后出现 'git-svn-id:' 行。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:765 #: en/git-svn.txt:765
#, priority:100 #, priority:100
msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild them." msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild them."
msgstr "" msgstr "这个选项只能用于一次性导入，因为如果没有元数据，'git svn' 将无法再次获取。此外，如果丢失了 '$GIT_DIR/svn/\\**/.rev_map.*' 文件，'git svn' 将无法重建它们。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:769 #: en/git-svn.txt:769
...@@ -56799,7 +56799,7 @@ msgstr "The 'git svn log' command will not work on repositories using this, eith ...@@ -56799,7 +56799,7 @@ msgstr "The 'git svn log' command will not work on repositories using this, eith
#: en/git-svn.txt:777 #: en/git-svn.txt:777
#, priority:100 #, priority:100
msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users." msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr "" msgstr "不建议使用该选项，因为它会导致难以在现有文档、错误报告和归档中查找到 SVN 修订版本号的旧引用。 如果你计划最终从 SVN 迁移到 Git，并确定要放弃 SVN 历史，请考虑 https://github.com/newren/git-filter-repo[git-filter-repo]。filter-repo 还允许重新格式化元数据，以方便阅读，并为非 \"svn.authorsFile\" 用户重写作者信息。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:778 #: en/git-svn.txt:778
...@@ -56817,13 +56817,13 @@ msgstr "svn-remote.<name>.useSvmProps" ...@@ -56817,13 +56817,13 @@ msgstr "svn-remote.<name>.useSvmProps"
#: en/git-svn.txt:782 #: en/git-svn.txt:782
#, priority:100 #, priority:100
msgid "This allows 'git svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata." msgid "This allows 'git svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata."
msgstr "" msgstr "这样，'git svn' 就能从使用 SVN::Mirror （或 svk）创建的元数据镜像中重新映射仓库 URL 和 UUID。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:790 #: en/git-svn.txt:790
#, priority:100 #, priority:100
msgid "If an SVN revision has a property, \"svm:headrev\", it is likely that the revision was created by SVN::Mirror (also used by SVK). The property contains a repository UUID and a revision. We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit messages." msgid "If an SVN revision has a property, \"svm:headrev\", it is likely that the revision was created by SVN::Mirror (also used by SVK). The property contains a repository UUID and a revision. We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit messages."
msgstr "" msgstr "如果 SVN 修订版有 \"svm:headrev\" 属性，则该修订版很可能是由 SVN::Mirror（SVK 也在使用）创建的。 该属性包含一个仓库 UUID 和一个修订版本。 我们想让它看起来像是在镜像原始 URL，因此引入了一个辅助函数来返回原始身份 URL 和 UUID，并在提交消息中生成元数据时使用它。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:791 #: en/git-svn.txt:791
...@@ -56841,7 +56841,7 @@ msgstr "svn-remote.<name>.useSvnsyncprops" ...@@ -56841,7 +56841,7 @@ msgstr "svn-remote.<name>.useSvnsyncprops"
#: en/git-svn.txt:796 #: en/git-svn.txt:796
#, priority:100 #, priority:100
msgid "Similar to the useSvmProps option; this is for users of the svnsync(1) command distributed with SVN 1.4.x and later." msgid "Similar to the useSvmProps option; this is for users of the svnsync(1) command distributed with SVN 1.4.x and later."
msgstr "" msgstr "与 useSvmProps 选项类似；适用于使用随 SVN 1.4.x 及更高版本发布的 svnsync(1) 命令的用户。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:797 #: en/git-svn.txt:797
...@@ -56853,7 +56853,7 @@ msgstr "svn-remote.<name>.rewriteRoot" ...@@ -56853,7 +56853,7 @@ msgstr "svn-remote.<name>.rewriteRoot"
#: en/git-svn.txt:803 #: en/git-svn.txt:803
#, priority:100 #, priority:100
msgid "This allows users to create repositories from alternate URLs. For example, an administrator could run 'git svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL." msgid "This allows users to create repositories from alternate URLs. For example, an administrator could run 'git svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL."
msgstr "" msgstr "这样，用户就可以通过其他 URL 创建仓库。 例如，管理员可以在本地服务器上运行 'git svn'（通过 file://访问），但希望在元数据中发布带有公共 http:// 或 svn:// URL 的仓库，这样用户就能看到公共 URL。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:804 #: en/git-svn.txt:804
...@@ -56865,7 +56865,7 @@ msgstr "svn-remote.<name>.rewriteUUID" ...@@ -56865,7 +56865,7 @@ msgstr "svn-remote.<name>.rewriteUUID"
#: en/git-svn.txt:809 #: en/git-svn.txt:809
#, priority:100 #, priority:100
msgid "Similar to the useSvmProps option; this is for users who need to remap the UUID manually. This may be useful in situations where the original UUID is not available via either useSvmProps or useSvnsyncProps." msgid "Similar to the useSvmProps option; this is for users who need to remap the UUID manually. This may be useful in situations where the original UUID is not available via either useSvmProps or useSvnsyncProps."
msgstr "" msgstr "与 useSvmProps 选项类似，适用于需要手动重新映射 UUID 的用户。在无法通过 useSvmProps 或 useSvnsyncProps 获取原始 UUID 的情况下，该选项可能非常有用。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:810 #: en/git-svn.txt:810
...@@ -56877,19 +56877,19 @@ msgstr "svn-remote.<name>.pushurl" ...@@ -56877,19 +56877,19 @@ msgstr "svn-remote.<name>.pushurl"
#: en/git-svn.txt:819 #: en/git-svn.txt:819
#, priority:100 #, priority:100
msgid "Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes precedence." msgid "Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes precedence."
msgstr "" msgstr "与 Git 的 `remote.<名称>.pushurl` 类似，该键设计用于 'url' 通过只读传输指向 SVN 仓库的情况，以提供另一种读/写传输。假定这两个键都指向同一个仓库。与 'commiturl' 不同，'pushurl' 是一个基本路径。如果可以使用 'commiturl' 或 'pushurl'，则 'commiturl' 优先。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:820 #: en/git-svn.txt:820
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "svn.brokenSymlinkWorkaround" msgid "svn.brokenSymlinkWorkaround"
msgstr "" msgstr "svn.brokenSymlinkWorkaround"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:828 #: en/git-svn.txt:828
#, priority:100 #, priority:100
msgid "This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients. Set this option to \"false\" if you track a SVN repository with many empty blobs that are not symlinks. This option may be changed while 'git svn' is running and take effect on the next revision fetched. If unset, 'git svn' assumes this option to be \"true\"." msgid "This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients. Set this option to \"false\" if you track a SVN repository with many empty blobs that are not symlinks. This option may be changed while 'git svn' is running and take effect on the next revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
msgstr "" msgstr "此选项会禁用潜在的高代价检查，以解决因客户端损坏而检查到 SVN 中的符号链接的问题。 如果你追踪的 SVN 版本库中有很多不是符号链接的空 blob，请将此选项设为 \"false\"。 该选项可在运行 'git svn' 时修改，并在下一个版本获取时生效。 如果不设置，'git svn ' 将假定该选项为 \"true\"。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:829 #: en/git-svn.txt:829
...@@ -56901,7 +56901,7 @@ msgstr "svn.pathnameencoding" ...@@ -56901,7 +56901,7 @@ msgstr "svn.pathnameencoding"
#: en/git-svn.txt:834 #: en/git-svn.txt:834
#, priority:100 #, priority:100
msgid "This instructs git svn to recode pathnames to a given encoding. It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ASCII characters. Valid encodings are the ones supported by Perl's Encode module." msgid "This instructs git svn to recode pathnames to a given encoding. It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ASCII characters. Valid encodings are the ones supported by Perl's Encode module."
msgstr "" msgstr "指示 git svn 将路径名重新编码为给定的编码。 Windows 用户和在非 UTF8 本地环境中工作的用户可以使用它来避免文件名被非 ASCII 字符破坏。 有效的编码是 Perl 的编码模块所支持的编码。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:835 #: en/git-svn.txt:835
...@@ -56913,31 +56913,31 @@ msgstr "svn-remote.<name>.automkdirs" ...@@ -56913,31 +56913,31 @@ msgstr "svn-remote.<name>.automkdirs"
#: en/git-svn.txt:842 #: en/git-svn.txt:842
#, priority:100 #, priority:100
msgid "Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to recreate empty directories that are in the Subversion repository. If this option is set to \"false\", then empty directories will only be created if the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' assumes this option to be \"true\"." msgid "Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to recreate empty directories that are in the Subversion repository. If this option is set to \"false\", then empty directories will only be created if the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' assumes this option to be \"true\"."
msgstr "" msgstr "通常，\"git svn clone\" 和 \"git svn rebase\" 命令会尝试重新创建 Subversion 仓库中的空目录。 如果将此选项设为 \"false\"，那么只有在显式运行 \"git svn mkdirs\" 命令时才会创建空目录。 如果不设置，'git svn' 将假定该选项为 \"true\"。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:847 #: en/git-svn.txt:847
#, priority:100 #, priority:100
msgid "Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps options all affect the metadata generated and used by 'git svn'; they *must* be set in the configuration file before any history is imported and these settings should never be changed once they are set." msgid "Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps options all affect the metadata generated and used by 'git svn'; they *must* be set in the configuration file before any history is imported and these settings should never be changed once they are set."
msgstr "" msgstr "由于 noMetadata、rewriteRoot、rewriteUUID、useSvnsyncProps 和 useSvmProps 选项都会影响 'git svn' 生成和使用的元数据，因此必须在导入任何历史记录之前在配置文件中设置这些选项，而且一旦设置后就不得更改。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:851 #: en/git-svn.txt:851
#, priority:100 #, priority:100
msgid "Additionally, only one of these options can be used per svn-remote section because they affect the 'git-svn-id:' metadata line, except for rewriteRoot and rewriteUUID which can be used together." msgid "Additionally, only one of these options can be used per svn-remote section because they affect the 'git-svn-id:' metadata line, except for rewriteRoot and rewriteUUID which can be used together."
msgstr "" msgstr "此外，每个 svn-remote 部分只能使用其中一个选项，因为它们会影响 'git-svn-id:' 元数据行，但 rewriteRoot 和 rewriteUUID 可以一起使用。"
   
#. type: Title - #. type: Title -
#: en/git-svn.txt:854 #: en/git-svn.txt:854
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "BASIC EXAMPLES" msgid "BASIC EXAMPLES"
msgstr "" msgstr "基本示例"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:858 #: en/git-svn.txt:858
#, priority:100 #, priority:100
msgid "Tracking and contributing to the trunk of a Subversion-managed project (ignoring tags and branches):" msgid "Tracking and contributing to the trunk of a Subversion-managed project (ignoring tags and branches):"
msgstr "" msgstr "跟踪和贡献 Subversion 管理项目的主干（忽略标签和分支）："
   
#. type: delimited block - #. type: delimited block -
#: en/git-svn.txt:876 #: en/git-svn.txt:876
...@@ -56959,13 +56959,13 @@ msgid "" ...@@ -56959,13 +56959,13 @@ msgid ""
"\tgit svn dcommit\n" "\tgit svn dcommit\n"
"# Append svn:ignore settings to the default Git exclude file:\n" "# Append svn:ignore settings to the default Git exclude file:\n"
"\tgit svn show-ignore >> .git/info/exclude\n" "\tgit svn show-ignore >> .git/info/exclude\n"
msgstr "" msgstr "# 克隆一个仓库（类似 git clone）：\n\tgit svn clone http://svn.example.com/project/trunk\n# 进入新克隆仓库的文件夹：\n\tcd trunk\n# 用 git branch 再次确认目前在 master（主）分支上\n\tgit branch\n# 将一些工作进行本地的 Git 提交\n\tgit commit ...\n# 提交到 SVN 的内容，根据\n# SVN 中的最新更改：\n\tgit svn rebase\n# 现在将（之前用 Git 提交的）修改提交到 SVN、\n# 同时自动更新您的工作 HEAD：\n\tgit svn dcommit\n# 将 svn:ignore 设置附加到默认的 Git 排除文件\n\tgit svn show-ignore >> .git/info/exclude\n"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:880 #: en/git-svn.txt:880
#, priority:100 #, priority:100
msgid "Tracking and contributing to an entire Subversion-managed project (complete with a trunk, tags and branches):" msgid "Tracking and contributing to an entire Subversion-managed project (complete with a trunk, tags and branches):"
msgstr "" msgstr "跟踪和参与整个 Subversion 管理的项目（包括主干、标签和分支）："
   
#. type: delimited block - #. type: delimited block -
#: en/git-svn.txt:895 #: en/git-svn.txt:895
...@@ -56984,13 +56984,13 @@ msgid "" ...@@ -56984,13 +56984,13 @@ msgid ""
"\tgit reset --hard svn/trunk\n" "\tgit reset --hard svn/trunk\n"
"# You may only dcommit to one branch/tag/trunk at a time. The usage\n" "# You may only dcommit to one branch/tag/trunk at a time. The usage\n"
"# of dcommit/rebase/show-ignore should be the same as above.\n" "# of dcommit/rebase/show-ignore should be the same as above.\n"
msgstr "" msgstr "# 用标准 SVN 目录布局克隆一个仓库（与 git clone 类似）：\n\tgit svn clone http://svn.example.com/project --stdlayout --prefix svn/\n# 或者，如果仓库使用非标准目录布局：\n\tgit svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/\n# 查看您克隆的所有分支和标签：\n\tgit branch -r\n# 在 SVN 中创建一个新分支\n\tgit svn branch waldo\n# 重置您的主分支为 trunk（或任何其他分支，用适当的名称替换 'trunk'\n# 替换为合适的名称）：\n\tgit reset --hard svn/trunk\n# 一次只能提交到一个分支/标签/主干。 使用\n# dcommit/rebase/show-ignore 的用法应与上述相同。\n"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:903 #: en/git-svn.txt:903
#, priority:100 #, priority:100
msgid "The initial 'git svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use 'git svn' to interact with the same Subversion repository, you can do the initial 'git svn clone' to a repository on a server and have each person clone that repository with 'git clone':" msgid "The initial 'git svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use 'git svn' to interact with the same Subversion repository, you can do the initial 'git svn clone' to a repository on a server and have each person clone that repository with 'git clone':"
msgstr "" msgstr "最初的 'git svn clone' 可能相当耗时（尤其是对于大型 Subversion 仓库）。如果多人（或一人拥有多台机器）想用 'git svn' 与同一个 Subversion 仓库交互，可以先用 'git svn clone' 克隆服务器上的仓库，然后让每个人用 'git clone' 克隆该仓库："
   
#. type: delimited block - #. type: delimited block -
#: en/git-svn.txt:924 #: en/git-svn.txt:924
...@@ -57015,79 +57015,79 @@ msgid "" ...@@ -57015,79 +57015,79 @@ msgid ""
"\tgit svn init http://svn.example.com/project [options...]\n" "\tgit svn init http://svn.example.com/project [options...]\n"
"# Pull the latest changes from Subversion\n" "# Pull the latest changes from Subversion\n"
"\tgit svn rebase\n" "\tgit svn rebase\n"
msgstr "" msgstr "# 在服务器上进行初始导入\n\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n# 克隆到本地 - 确保 refs/remotes/ 空间与服务器一致\n\tmkdir project\n\tcd project\n\tgit init\n\tgit remote add origin server:/pub/project\n\tgit config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'\n\tgit fetch\n# 防止将来从远程 Git 服务器获取/拉取、\n# 我们只想在将来的更新中使用 git svn\n\tgit config --remove-section remote.origin\n# 从刚刚获取的分支中创建一个本地分支\n\tgit checkout -b master FETCH_HEAD\n# 在本地初始化 \"git svn\"（确保使用相同的 URL 和\n--stdlayout/-T/-b/-t/-t--prefix 选项）。\n\tgit svn init http://svn.example.com/project [options...]\n# 从 Subversion 拉取最新修改\n\tgit svn rebase\n"
   
#. type: Title - #. type: Title -
#: en/git-svn.txt:927 #: en/git-svn.txt:927
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "REBASE VS. PULL/MERGE" msgid "REBASE VS. PULL/MERGE"
msgstr "" msgstr "REBASE VS. PULL/MERGE （变基与拉取/合并对比）"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:933 #: en/git-svn.txt:933
#, priority:100 #, priority:100
msgid "Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred 'git svn dcommit' subcommand to push unintegrated commits back into SVN." msgid "Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred 'git svn dcommit' subcommand to push unintegrated commits back into SVN."
msgstr "" msgstr "优先使用 'git svn rebase' 或 'git rebase'，而不是 'git pull' 或 'git merge' 来同步未整合提交与 'git svn' 分支。这样做将使未整合提交的历史与上游 SVN 仓库保持线性关系，并允许使用首选的 'git svn dcommit' 子命令将未整合提交推回 SVN。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:941 #: en/git-svn.txt:941
#, priority:100 #, priority:100
msgid "Originally, 'git svn' recommended that developers pulled or merged from the 'git svn' branch. This was because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear history to be flattened when committing into SVN and this can lead to merge commits unexpectedly reversing previous commits in SVN." msgid "Originally, 'git svn' recommended that developers pulled or merged from the 'git svn' branch. This was because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear history to be flattened when committing into SVN and this can lead to merge commits unexpectedly reversing previous commits in SVN."
msgstr "" msgstr "最初，'git svn' 建议开发者从 'git svn' 分支拉取或合并。 这是因为作者倾向于用 `git svn set-tree B` 来提交单个头，而不是用 `git svn set-tree A..B` 来提交多个头。使用 'git pull' 或 'git merge' 和 `git svn set-tree A..B` 会导致非线性历史在提交到 SVN 时被扁平化，这可能会导致合并提交意外地在 SVN 中逆转之前的提交。"
   
#. type: Title - #. type: Title -
#: en/git-svn.txt:943 #: en/git-svn.txt:943
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "MERGE TRACKING" msgid "MERGE TRACKING"
msgstr "" msgstr "合并跟踪"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:950 #: en/git-svn.txt:950
#, priority:100 #, priority:100
msgid "While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below)." msgid "While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below)."
msgstr "" msgstr "虽然 'git svn' 可以跟踪采用标准布局的仓库的复制历史（包括分支和标记），但它还不能将发生在 git 内部的合并历史回溯到 SVN 用户的上游。 因此，我们建议用户尽可能在 Git 内部保持线性的历史记录，以方便与 SVN 兼容（见下文 “注意事项” 部分）。"
   
#. type: Title - #. type: Title -
#: en/git-svn.txt:952 #: en/git-svn.txt:952
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "HANDLING OF SVN BRANCHES" msgid "HANDLING OF SVN BRANCHES"
msgstr "" msgstr "处理 svn 分支"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:960 #: en/git-svn.txt:960
#, priority:100 #, priority:100
msgid "If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of the other branches." msgid "If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of the other branches."
msgstr "" msgstr "如果 'git svn' 被配置为获取分支（且 --follow-branches 有效），它有时会为一个 SVN 分支创建多个 Git 分支，这些附加分支的名称为 'branchname@nnn'（nnn 为 SVN 修订版本号）。 如果 'git svn' 无法为 SVN 分支的第一次提交找到父提交，就会创建这些附加分支，以便将该分支与其他分支的历史连接起来。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:976 #: en/git-svn.txt:976
#, priority:100 #, priority:100
msgid "Normally, the first commit in an SVN branch consists of a copy operation. 'git svn' will read this commit to get the SVN revision the branch was created from. It will then try to find the Git commit that corresponds to this SVN revision, and use that as the parent of the branch. However, it is possible that there is no suitable Git commit to serve as parent. This will happen, among other reasons, if the SVN branch is a copy of a revision that was not fetched by 'git svn' (e.g. because it is an old revision that was skipped with `--revision`), or if in SVN a directory was copied that is not tracked by 'git svn' (such as a branch that is not tracked at all, or a subdirectory of a tracked branch). In these cases, 'git svn' will still create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the branch was copied from and create appropriate Git commits. This is indicated by the message \"Initializing parent: <branchname>\"." msgid "Normally, the first commit in an SVN branch consists of a copy operation. 'git svn' will read this commit to get the SVN revision the branch was created from. It will then try to find the Git commit that corresponds to this SVN revision, and use that as the parent of the branch. However, it is possible that there is no suitable Git commit to serve as parent. This will happen, among other reasons, if the SVN branch is a copy of a revision that was not fetched by 'git svn' (e.g. because it is an old revision that was skipped with `--revision`), or if in SVN a directory was copied that is not tracked by 'git svn' (such as a branch that is not tracked at all, or a subdirectory of a tracked branch). In these cases, 'git svn' will still create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the branch was copied from and create appropriate Git commits. This is indicated by the message \"Initializing parent: <branchname>\"."
msgstr "" msgstr "通常，SVN 分支的第一次提交包括复制操作。'git svn' 会读取该提交，以获得创建分支的 SVN 版本。然后，它会尝试找到与该 SVN 版本相对应的 Git 提交，并将其作为分支的父分支。不过，也有可能没有合适的 Git 提交作为父分支。 除其他原因外，如果 SVN 分支是一个修订版本的副本，而 'git svn' 没有获取该修订版本（例如，因为它是一个用 `--revision` 跳过的旧修订版本），或者在 SVN 中复制了一个 'git svn' 不跟踪的目录（例如一个根本不跟踪的分支，或者一个已跟踪分支的子目录），就会出现这种情况。在这种情况下，'git svn' 仍会创建一个 Git 分支，但它不会使用现有的 Git 提交作为该分支的父提交，而是会读取该分支被复制的目录的 SVN 历史记录，并创建适当的 Git 提交。 信息 \"Initializing parent:<分支名>\"信息来表示。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:983 #: en/git-svn.txt:983
#, priority:100 #, priority:100
msgid "Additionally, it will create a special branch named '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision number the branch was copied from. This branch will point to the newly created parent commit of the branch. If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'." msgid "Additionally, it will create a special branch named '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision number the branch was copied from. This branch will point to the newly created parent commit of the branch. If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'."
msgstr "" msgstr "此外，它还会创建一个名为 '<分支名>@<SVN-版本>' 的特殊分支，其中 <SVN-版本> 是该分支复制自的 SVN 版本号。 该分支将指向该分支新创建的父提交。 如果该分支在 SVN 中被删除，后来又从不同版本重新创建，则会出现多个带 '@' 的分支。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:986 #: en/git-svn.txt:986
#, priority:100 #, priority:100
msgid "Note that this may mean that multiple Git commits are created for a single SVN revision." msgid "Note that this may mean that multiple Git commits are created for a single SVN revision."
msgstr "" msgstr "请注意，这可能意味着一个 SVN 修订版会创建多个 Git 提交。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:996 #: en/git-svn.txt:996
#, priority:100 #, priority:100
msgid "An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched by copying it to branches/. 'git svn clone -s' will then create a branch 'sub'. It will also create new Git commits for r.100 through r.199 and use these as the history of branch 'sub'. Thus there will be two Git commits for each revision from r.100 to r.199 (one containing trunk/, one containing trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)." msgid "An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched by copying it to branches/. 'git svn clone -s' will then create a branch 'sub'. It will also create new Git commits for r.100 through r.199 and use these as the history of branch 'sub'. Thus there will be two Git commits for each revision from r.100 to r.199 (one containing trunk/, one containing trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
msgstr "" msgstr "举个例子：在一个采用标准 trunk/tags/branches 布局的 SVN 代码库中，r.100 中创建了 trunk/sub 目录。 在 r.200 中，trunk/sub 被复制到 branches/ 中，从而被分支。'git svn clone -s' 会创建一个分支 'sub'。它还会为 r.100 至 r.199 创建新的 Git 提交，并将其作为分支 'sub' 的历史。这样，从 r.100 到 r.199 的每个修订版本都会有两个 Git 提交（一个包含 trunk/，一个包含 trunk/sub/）。最后，它会创建一个分支 'sub@200'，指向分支 'sub' 的新父提交（即 r.200 和 trunk/sub/ 的提交）。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:1006 #: en/git-svn.txt:1006
#, priority:100 #, priority:100
msgid "For the sake of simplicity and interoperating with Subversion, it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations between Git repositories and branches. The recommended method of exchanging code between Git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository." msgid "For the sake of simplicity and interoperating with Subversion, it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations between Git repositories and branches. The recommended method of exchanging code between Git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository."
msgstr "" msgstr "为简单起见并与 Subversion 互操作，建议所有 'git svn' 用户直接从 SVN 服务器 clone、fetch 和 dcommit，避免在 Git 仓库和分支之间进行所有 'git clone'/'pull'/'merge'/'push' 操作。 在 Git 分支和用户之间交换代码的推荐方法是 'git format-patch' 和 'git am'，或直接 'dcommit' 到 SVN 仓库。"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:1012 #: en/git-svn.txt:1012
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr