Re: [PATCH v3 6/6] docs/zh_CN: Add translation zh_CN/maintainer/modifying-patches.rst

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2021/5/14 上午3:08, Wu XiangCheng wrote:
> Add a new translation
>   Documentation/translations/zh_CN/maintainer/modifying-patches.rst
> and link it to zh_CN/maintainer/index.rst
> 
> Signed-off-by: Wu XiangCheng <bobwxc@xxxxxxxx>
> Reviewed-by: Yanteng Si <siyanteng@xxxxxxxxxxx>
> ---
>  .../translations/zh_CN/maintainer/index.rst   |  4 +-
>  .../zh_CN/maintainer/modifying-patches.rst    | 51 +++++++++++++++++++
>  2 files changed, 52 insertions(+), 3 deletions(-)
>  create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst
> 
> diff --git a/Documentation/translations/zh_CN/maintainer/index.rst b/Documentation/translations/zh_CN/maintainer/index.rst
> index 18a820741f52..eb75ccea9a21 100644
> --- a/Documentation/translations/zh_CN/maintainer/index.rst
> +++ b/Documentation/translations/zh_CN/maintainer/index.rst
> @@ -17,7 +17,5 @@
>     rebasing-and-merging
>     pull-requests
>     maintainer-entry-profile
> +   modifying-patches
>  
> -TODOList:
> -
> --   modifying-patches
> diff --git a/Documentation/translations/zh_CN/maintainer/modifying-patches.rst b/Documentation/translations/zh_CN/maintainer/modifying-patches.rst
> new file mode 100644
> index 000000000000..6f3bf493440c
> --- /dev/null
> +++ b/Documentation/translations/zh_CN/maintainer/modifying-patches.rst
> @@ -0,0 +1,51 @@
> +.. include:: ../disclaimer-zh_CN.rst
> +
> +:Original: Documentation/maintainer/modifying-patches.rst
> +
> +:译者:
> +
> + 吴想成 Wu XiangCheng <bobwxc@xxxxxxxx>
> +
> +.. _modifyingpatches_zh:
> +
> +修改补丁
> +========
> +
> +如果你是子系统或者分支的维护者,由于代码在你的和提交者的树中并不完全相同,
> +有时你需要稍微修改一下收到的补丁以合并它们。
> +
> +如果你严格遵守开发者来源证书的规则(c),你应该要求提交者重做,但这完全是会
> +适得其反的时间、精力浪费。规则(b)允许你调整代码,但这样修改提交者的代码并
> +让他背书你的错误是非常不礼貌的。为解决此问题,建议在你之前最后一个
> +Signed-off-by标签和你的之间添加一行,以指示更改的性质。这没有强制性要求,最
> +好在描述前面加上你的邮件和/或姓名,用方括号括住整行,以明显指出你对最后一刻
> +的更改负责。例如::
> +
> +        Signed-off-by: Random J Developer <random@xxxxxxxxxxxxxxxxxxxxx>
> +        [lucky@xxxxxxxxxxxxxxxxxxxxxx: struct foo moved from foo.c to foo.h]
> +        Signed-off-by: Lucky K Maintainer <lucky@xxxxxxxxxxxxxxxxxxxxxx>
> +
> +如果您维护着一个稳定的分支,并希望同时明确贡献、跟踪更改、合并修复,并保护
> +提交者免受责难,这种做法尤其有用。请注意,在任何情况下都不得更改作者的身份
> +(From头),因为它会在变更日志中显示。
> +
> +回传(back-port)者特别要注意:为了便于跟踪,请在提交消息的顶部(就在主题行

I saw backport was translated a lot as 回合. Need a reconsideration?

Thanks
Alex

> +之后)插入补丁的来源,这是一种常见而有用的做法。例如,我们可以在3.x稳定版本
> +中看到以下内容::
> +
> +        Date:   Tue Oct 7 07:26:38 2014 -0400
> +
> +        libata: Un-break ATA blacklist
> +
> +        commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
> +
> +下面是一个旧的内核在某补丁被回传后会出现的::
> +
> +        Date:   Tue May 13 22:12:27 2008 +0200
> +
> +        wireless, airo: waitbusy() won't delay
> +
> +        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
> +
> +不管什么格式,这些信息都为人们跟踪你的树,以及试图解决你树中的错误的人提供了
> +有价值的帮助。



[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux