Skip to content

Translate 08-customizing-git attributes #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2015
Merged

Translate 08-customizing-git attributes #132

merged 2 commits into from
Aug 16, 2015

Conversation

spacewander
Copy link
Contributor

No description provided.

@networm networm changed the title translated 08-customizing-git/attributes Translate 08-customizing-git attributes Jun 19, 2015
@networm
Copy link
Member

networm commented Jul 11, 2015

注意一个问题,提交的 Pull Request 右上角显示的增加删除行数应是一致的。
需要保证英文原文是几行,中文就是几行,不可以随意多行或少行,要保证英文一行中对应的中文翻译都在一行。

@spacewander
Copy link
Contributor Author

更新了下内容,现在中文翻译行数和英文原文行数一致了。

@networm networm mentioned this pull request Jul 29, 2015
95 tasks
@networm networm modified the milestone: v1.0.0 Jul 29, 2015
Some of these settings can also be specified for a path, so that Git applies those settings only for a subdirectory or subset of files.
These path-specific settings are called Git attributes and are set either in a `.gitattributes` file in one of your directories (normally the root of your project) or in the `.git/info/attributes` file if you don't want the attributes file committed with your project.
你也可以针对特定的路径配置某些设置项,这样 Git 就只对特定的子目录或子文件集运用它们。
这些基于路径的设置项被称为 Git 属性,可以在你的目录下的 `.gitattributes` 文件内进行设置(通常是你的项目的根目录)。如果不想让这些属性文件连同其它文件提交时,你也可以在 `.git/info/attributes` 进行设置。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果不想让这些属性文件连同其它文件提交时=》如果不想让这些属性文件与其它文件一同提交

@IceNature
Copy link
Contributor

@spacewander 已完成

Some of these settings can also be specified for a path, so that Git applies those settings only for a subdirectory or subset of files.
These path-specific settings are called Git attributes and are set either in a `.gitattributes` file in one of your directories (normally the root of your project) or in the `.git/info/attributes` file if you don't want the attributes file committed with your project.
你也可以针对特定的路径配置某些设置项,这样 Git 就只对特定的子目录或子文件集运用它们。
这些基于路径的设置项被称为 Git 属性,可以在你的目录下的 `.gitattributes` 文件内进行设置(通常是你的项目的根目录)。如果不想让这些属性文件与其它文件一同提交,你也可以在 `.git/info/attributes` 进行设置。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你也可以在 .git/info/attributes 文件中进行设置。

.The ``smudge'' filter is run on checkout.
image::images/smudge.png[The ``smudge'' filter is run on checkout.]
.smudge”过滤器会在文件被签出时触发
image::images/smudge.png[smudge”过滤器会在文件被签出时触发。]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

签出 -> 检出

@oldsharp
Copy link
Contributor

@spacewander 我的 review 已经完成,请检查。

@spacewander
Copy link
Contributor Author

除了export-subst部分,其他都已将按建议进行了更改。
@oldsharp
export-subst部分中有一处是成段的提交信息,这里需不需要译成中文呢?

@spacewander
Copy link
Contributor Author

@oldsharp
我把 export-subst 最新的原文和译文一并提交了。
等你审阅完毕后,我再把原文删掉。

@oldsharp
Copy link
Contributor

@spacewander

export-subst 小节已经 review 完成,没有意见。

其他修改也都已检查过,没有问题。

关于 99-105 行是否需要使用原文、提交信息是否需要翻译,我个人的意见是,[source.console]标签内的内容都应当保留原文。
这个问题可以再咨询一下其他人的意见?

@spacewander
Copy link
Contributor Author

@oldsharp
个人觉得,大段文字如果能翻译成中文的话,带入感会更加强烈,阅读体验会更好?
不如在Q群上讨论这个问题吧。

@spacewander
Copy link
Contributor Author

按照Q群上的反馈,保留了source.console标签中的英文原文

@networm networm merged commit e4da805 into progit:master Aug 16, 2015
@networm
Copy link
Member

networm commented Aug 16, 2015

@spacewander @IceNature @secondwtq @oldsharp 已合并入主干。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants