diff options
Diffstat (limited to 'docs/_locale/_pot/development.pot')
| -rw-r--r-- | docs/_locale/_pot/development.pot | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/docs/_locale/_pot/development.pot b/docs/_locale/_pot/development.pot index b4de8c0..7f654d1 100644 --- a/docs/_locale/_pot/development.pot +++ b/docs/_locale/_pot/development.pot @@ -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. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Bottle 0.13-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-13 21:49+0100\n" +"POT-Creation-Date: 2020-12-31 18:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -125,7 +125,7 @@ msgid "The source repository is structured as follows:" msgstr "" #: ../../development.rst:55 -msgid "master branch" +msgid "``master`` branch" msgstr "" #: ../../development.rst:55 @@ -133,158 +133,149 @@ msgid "This is the integration, testing and development branch. All changes that msgstr "" #: ../../development.rst:58 -msgid "release-x.y branches" +msgid "``release-x.y`` branches" msgstr "" #: ../../development.rst:58 msgid "As soon as the master branch is (almost) ready for a new release, it is branched into a new release branch. This \"release candidate\" is feature-frozen but may receive bug-fixes and last-minute changes until it is considered production ready and officially released. From that point on it is called a \"support branch\" and still receives bug-fixes, but only important ones. The revision number is increased on each push to these branches, so you can keep up with important changes." msgstr "" -#: ../../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 "" - -#: ../../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 "" -#: ../../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 use a separate branch for each feature or bug to make integration as easy as possible. Thats all. There are git workflow examples at the bottom of this page." msgstr "" -#: ../../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 "" -#: ../../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, not the branches. A branch may contain changes that are not released yet, but a tag marks the exact commit which changed the version number." msgstr "" -#: ../../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, apply your changes and send a pull-request. Further down this page is a small collection of git workflow examples that may guide you. Submitting git-compatible patches to the mailing list is fine too. In any case, please follow some basic rules:" msgstr "" -#: ../../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 "" -#: ../../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 "" -#: ../../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 "" -#: ../../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 "" -#: ../../development.rst:124 +#: ../../development.rst:121 msgid "GIT Workflow Examples" msgstr "" -#: ../../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 "" -#: ../../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 project page <https://github.com/bottlepy/bottle>`_. When the fork is done, you will be presented with a short introduction to your new repository." msgstr "" -#: ../../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 make changes to it. Make sure you use the private (read-write) URL and *not* the public (read-only) one::" msgstr "" -#: ../../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 you, this does not point to the original bottle repository, but to your own fork. To keep track of the official repository, add another remote named \"upstream\"::" msgstr "" -#: ../../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 "" -#: ../../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, they must be based on ``upstream/master``. To create a new feature-branch, type the following::" msgstr "" -#: ../../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 "" -#: ../../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 branch already (see next step), this is not an option because it rewrites your history. You can do a normal pull instead. Resolve any conflicts, run the tests again and commit." msgstr "" -#: ../../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 "" -#: ../../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 be to start a thread in the mailing-list, which is recommended. It allows other developers to see and discuss your patches and you get some feedback for free :)" msgstr "" -#: ../../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 "" -#: ../../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 "" -#: ../../development.rst:171 +#: ../../development.rst:168 msgid "Branch off of the affected release branches instead of just the development branch." msgstr "" -#: ../../development.rst:172 +#: ../../development.rst:169 msgid "Write at least one test-case that triggers the bug." msgstr "" -#: ../../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 "" -#: ../../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``." msgstr "" - |