diff options
Diffstat (limited to 'docs/_locale/zh_CN/LC_MESSAGES/development.po')
| -rw-r--r-- | docs/_locale/zh_CN/LC_MESSAGES/development.po | 93 |
1 files changed, 41 insertions, 52 deletions
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/development.po b/docs/_locale/zh_CN/LC_MESSAGES/development.po index 8f4bc62..a772936 100644 --- a/docs/_locale/zh_CN/LC_MESSAGES/development.po +++ b/docs/_locale/zh_CN/LC_MESSAGES/development.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2009-2017, Marcel Hellkamp +# Copyright (C) 2009-2020, Marcel Hellkamp # This file is distributed under the same license as the Bottle package. # # Translators: @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: bottle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-19 14:15+0100\n" -"PO-Revision-Date: 2015-12-13 20:58+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2020-12-31 18:35+0100\n" +"PO-Revision-Date: 2020-12-31 17:35+0000\n" +"Last-Translator: defnull <marc@gsites.de>\n" "Language-Team: Chinese (China) (http://www.transifex.com/bottle/bottle/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,7 +185,7 @@ msgid "The source repository is structured as follows:" msgstr "代码仓库的结构如下:" #: ../../development.rst:55 -msgid "master branch" +msgid "``master`` branch" msgstr "" #: ../../development.rst:55 @@ -195,7 +195,7 @@ msgid "" msgstr "该分支用于集成，测试和开发。所有计划添加到下一版本的改动，会在这里合并和测试。" #: ../../development.rst:58 -msgid "release-x.y branches" +msgid "``release-x.y`` branches" msgstr "" #: ../../development.rst:58 @@ -209,33 +209,22 @@ msgid "" "branches, so you can keep up with important changes." msgstr "只要master分支已经可以用来发布一个新的版本，它会被安排到一个新的发行分支里面。在RC阶段，不再添加或删除特征，只接受bug-fix和小改动，直到认为它可以用于生产环境和正式发布。基于这点考虑，我们称之为“支持分支(support branch)”，依然接受bug-fix，但仅限关键的bug-fix。每次更改后，版本号都会更新，这样你就能及时获取重要的改动了。" -#: ../../development.rst:61 -msgid "bugfix_name-x.y branches" -msgstr "" - -#: ../../development.rst:61 -msgid "" -"These branches are only temporary and used to develop and share non-trivial " -"bug-fixes for existing releases. They are merged into the corresponding " -"release branch and deleted soon after that." -msgstr "这些分支是临时性的，用于修复现有发布版本的bug。在合并到其他分支后，它们就会被删除。" - -#: ../../development.rst:65 +#: ../../development.rst:62 msgid "Feature branches" msgstr "" -#: ../../development.rst:64 +#: ../../development.rst:61 msgid "" "All other branches are feature branches. These are based on the master " "branch and only live as long as they are still active and not merged back " "into ``master``." msgstr "所有这类分支都是用于新增特征的。基于master分支，在开发、合并完毕后，就会被删除。" -#: ../../development.rst:68 +#: ../../development.rst:65 msgid "What does this mean for a developer?" msgstr "对于开发者，这意味着什么？" -#: ../../development.rst:69 +#: ../../development.rst:66 msgid "" "If you want to add a feature, create a new branch from ``master``. If you " "want to fix a bug, branch ``release-x.y`` for each affected release. Please " @@ -244,17 +233,17 @@ msgid "" "page." msgstr "如果你想添加一个特征，可以从 ``master`` 分支创建一个分支。如果你想修复一个bug，可从 ``release-x.y`` 这类分支创建一个分支。无论是添加特征还是修复bug，都建议在一个独立的分支上进行，这样合并工作就简单了。就这些了！在页面底部会有git工作流程的例子。" -#: ../../development.rst:71 +#: ../../development.rst:68 msgid "" "Oh, and never ever change the release number. We'll do that on integration. " "You never know in which order we pull pending requests anyway :)" msgstr "Oh，请不要修改版本号。我们会在集成的时候进行修改。因为你不知道我们什么时候会将你的request pull下来:)" -#: ../../development.rst:75 +#: ../../development.rst:72 msgid "What does this mean for a maintainer ?" msgstr "对于软件包维护者，这意味着什么？" -#: ../../development.rst:76 +#: ../../development.rst:73 msgid "" "Watch the tags (and the mailing list) for bug-fixes and new releases. If you" " want to fetch a specific release from the git repository, trust the tags, " @@ -262,11 +251,11 @@ msgid "" "but a tag marks the exact commit which changed the version number." msgstr "关注那些bugfix和新版本的tag，还有邮件列表。如果你想从代码仓库中获取特定的版本，请使用tag，而不是分支。分支中也许会包含一些未发布的改动，但tag会标记是那个commit更改了版本号。" -#: ../../development.rst:80 +#: ../../development.rst:77 msgid "Submitting Patches" msgstr "提交补丁" -#: ../../development.rst:82 +#: ../../development.rst:79 msgid "" "The best way to get your changes integrated into the main development branch" " is to fork the main repository at github, create a new feature-branch, " @@ -276,57 +265,57 @@ msgid "" "follow some basic rules:" msgstr "让你的补丁被集成进来的最好方法，是在github上面fork整个项目，创建一个新的分支，修改代码，然后发送一个pull-request。页面下方是git工作流程的例子，也许会有帮助。提交git兼容的补丁文件到邮件列表也是可以的。无论使用什么方法，请遵守以下的基本规则:" -#: ../../development.rst:84 +#: ../../development.rst:81 msgid "" "**Documentation:** Tell us what your patch does. Comment your code. If you " "introduced a new feature, add to the documentation so others can learn about" " it." msgstr "**文档：** 告诉我们你的补丁做了什么。注释你的代码。如果你添加了新的特征，请添加相应的使用方法。" -#: ../../development.rst:85 +#: ../../development.rst:82 msgid "" "**Test:** Write tests to prove that your code works as expected and does not" " break anything. If you fixed a bug, write at least one test-case that " "triggers the bug. Make sure that all tests pass before you submit a patch." msgstr "**测试：** 编写测试以证明你的补丁如期工作，且没有破坏任何东西。如果你修复了一个bug，至少写一个测试用例来触发这个bug。在提交补丁之前，请确保所有测试已通过。" -#: ../../development.rst:86 +#: ../../development.rst:83 msgid "" "**One patch at a time:** Only fix one bug or add one feature at a time. " "Design your patches so that they can be applyed as a whole. Keep your " "patches clean, small and focused." msgstr "**一次只提交一个补丁：** 一次只修改一个bug，一次只添加一个新特征。保持补丁的干净。" -#: ../../development.rst:87 +#: ../../development.rst:84 msgid "" "**Sync with upstream:** If the ``upstream/master`` branch changed while you " "were working on your patch, rebase or pull to make sure that your patch " "still applies without conflicts." msgstr "**与上流同步：** 如果在你编写补丁的时候， ``upstream/master`` 分支被修改了，那么先rebase或将新的修改pull下来，确保你的补丁在合并的时候不会造成冲突。" -#: ../../development.rst:91 +#: ../../development.rst:88 msgid "Building the Documentation" msgstr "生成文档" -#: ../../development.rst:93 +#: ../../development.rst:90 msgid "" "You need a recent version of Sphinx to build the documentation. The " "recommended way is to install :command:`virtualenv` using your distribution " "package repository and install sphinx manually to get an up-to-date version." msgstr "你需要一个Sphinx的新版本来生产整份文档。建议将Sphinx安装到一个 :command:`virtualenv` 环境。" -#: ../../development.rst:124 +#: ../../development.rst:121 msgid "GIT Workflow Examples" msgstr "GIT工作流程" -#: ../../development.rst:126 +#: ../../development.rst:123 msgid "" "The following examples assume that you have an (free) `github account " "<https://github.com>`_. This is not mandatory, but makes things a lot " "easier." msgstr "接下来的例子都假设你已经有一个 `git的免费帐号 <https://github.com>`_ 。虽然不是必须的，但可简单化很多东西。" -#: ../../development.rst:128 +#: ../../development.rst:125 msgid "" "First of all you need to create a fork (a personal clone) of the official " "repository. To do this, you simply click the \"fork\" button on the `bottle " @@ -334,7 +323,7 @@ msgid "" "you will be presented with a short introduction to your new repository." msgstr "首先，你需要从官方代码仓库创建一个fork。只需在 `bottle项目页面 <https://github.com/bottlepy/bottle>`_ 点击一下\"fork\"按钮就行了。创建玩fork之后，会得到一个关于这个新仓库的简介。" -#: ../../development.rst:130 +#: ../../development.rst:127 msgid "" "The fork you just created is hosted at github and read-able by everyone, but" " write-able only by you. Now you need to clone the fork locally to actually " @@ -342,7 +331,7 @@ msgid "" " the public (read-only) one::" msgstr "你刚刚创建的fork托管在github上面，对所有人都是可见的，但只有你有修改的权限。现在你需要将其从线上clone下面，做出实际的修改。确保你使用的是(可写-可读)的私有URL，而不是(只读)的公开URL。" -#: ../../development.rst:134 +#: ../../development.rst:131 msgid "" "Once the clone is complete your repository will have a remote named " "\"origin\" that points to your fork on github. Don’t let the name confuse " @@ -351,18 +340,18 @@ msgid "" "\"upstream\"::" msgstr "在你将代码仓库clone下来后，就有了一个\"origin\"分支，指向你在github上的fork。不要让名字迷惑了你，它并不指向bottle的官方代码仓库，只是指向你自己的fork。为了追踪官方的代码仓库，可添加一个新的\"upstream\"远程分支。" -#: ../../development.rst:140 +#: ../../development.rst:137 msgid "" "Note that \"upstream\" is a public clone URL, which is read-only. You cannot" " push changes directly to it. Instead, we will pull from your public " "repository. This is described later." msgstr "注意，\"upstream\"分支使用的是公开的URL，是只读的。你不能直接往该分支push东西，而是由我们来你的公开代码仓库pull，后面会讲到。" -#: ../../development.rst:143 +#: ../../development.rst:140 msgid "Submit a Feature" msgstr "提交一个特征" -#: ../../development.rst:144 +#: ../../development.rst:141 msgid "" "New features are developed in separate feature-branches to make integration " "easy. Because they are going to be integrated into the ``master`` branch, " @@ -370,20 +359,20 @@ msgid "" "type the following::" msgstr "在独立的特征分支内开发新的特征，会令集成工作更简单。因为它们会被合并到 ``master`` 分支，所有它们必须是基于 ``upstream/master`` 的分支。下列命令创建一个特征分支。" -#: ../../development.rst:148 +#: ../../development.rst:145 msgid "" "Now implement your feature, write tests, update the documentation, make sure" " that all tests pass and commit your changes::" msgstr "现在可开始写代码，写测试，更新文档。在提交更改之前，记得确保所有测试已经通过。" -#: ../../development.rst:152 +#: ../../development.rst:149 msgid "" "If the ``upstream/master`` branch changed in the meantime, there may be " "conflicts with your changes. To solve these, 'rebase' your feature-branch " "onto the top of the updated ``upstream/master`` branch::" msgstr "与此同时，如果 ``upstream/master`` 这个分支有改动，那么你的提交就有可能造成冲突，可通过rebase操作来解决。" -#: ../../development.rst:157 +#: ../../development.rst:154 msgid "" "This is equivalent to undoing all your changes, updating your branch to the " "latest version and reapplying all your patches again. If you released your " @@ -392,13 +381,13 @@ msgid "" "the tests again and commit." msgstr "这相当于先撤销你的所有改动，更新你的分支到最新版本，再重做你的所有改动。如果你已经发布了你的分支(下一步会提及)，这就不是一个好主意了，因为会覆写你的提交历史。这种情况下，你应该先将最新版本pull下来，手动解决所有冲突，运行测试，再提交。" -#: ../../development.rst:159 +#: ../../development.rst:156 msgid "" "Now you are almost ready to send a pull request. But first you need to make " "your feature-branch public by pushing it to your github fork::" msgstr "现在，你已经做好准备发一个pull-request了。但首先你应该公开你的特征分支，很简单，将其push到你github的fork上面就行了。" -#: ../../development.rst:163 +#: ../../development.rst:160 msgid "" "After you’ve pushed your commit(s) you need to inform us about the new " "feature. One way is to send a pull-request using github. Another way would " @@ -407,39 +396,39 @@ msgid "" "for free :)" msgstr "在你push完你所有的commit之后，你需要告知我们这个新特征。一种办法是通过github发一个pull-request。另一种办法是把这个消息发到邮件列表，这也是我们推荐的方式，这样其他开发者就能看到和讨论你的补丁，你也能免费得到一些反馈 :)" -#: ../../development.rst:165 +#: ../../development.rst:162 msgid "" "If we accept your patch, we will integrate it into the official development " "branch and make it part of the next release." msgstr "如果我们接受了你的补丁，我们会将其集成到官方的开发分支中，它将成为下个发布版本的一部分。" -#: ../../development.rst:168 +#: ../../development.rst:165 msgid "Fix a Bug" msgstr "修复Bug" -#: ../../development.rst:169 +#: ../../development.rst:166 msgid "" "The workflow for bug-fixes is very similar to the one for features, but " "there are some differences:" msgstr "修复Bug和添加一个特征差不多，下面是一些不同点:" -#: ../../development.rst:171 +#: ../../development.rst:168 msgid "" "Branch off of the affected release branches instead of just the development " "branch." msgstr "修复所有受影响的分支，而不仅仅是开发分支(Branch off of the affected release branches instead of just the development branch)。" -#: ../../development.rst:172 +#: ../../development.rst:169 msgid "Write at least one test-case that triggers the bug." msgstr "至少编写一个触发该Bug的测试用例。" -#: ../../development.rst:173 +#: ../../development.rst:170 msgid "" "Do this for each affected branch including ``upstream/master`` if it is " "affected. ``git cherry-pick`` may help you reducing repetitive work." msgstr "修复所有受影响的分支，包括 ``upstream/master`` ，如果它也受影响。 ``git cherry-pick`` 可帮你完成一些重复工作。" -#: ../../development.rst:174 +#: ../../development.rst:171 msgid "" "Name your branch after the release it is based on to avoid confusion. " "Examples: ``my_bugfix-x.y`` or ``my_bugfix-dev``." |